diff options
Diffstat (limited to 'src/de/danoeh/antennapod/activity')
8 files changed, 52 insertions, 52 deletions
diff --git a/src/de/danoeh/antennapod/activity/AddFeedActivity.java b/src/de/danoeh/antennapod/activity/AddFeedActivity.java index d558043bd..bae737aa7 100644 --- a/src/de/danoeh/antennapod/activity/AddFeedActivity.java +++ b/src/de/danoeh/antennapod/activity/AddFeedActivity.java @@ -12,7 +12,7 @@ import android.content.DialogInterface; import android.content.Intent; import android.content.IntentFilter; import android.util.Log; -import de.danoeh.antennapod.BuildConfig; +import de.danoeh.antennapod.AppConfig; import de.danoeh.antennapod.R; import de.danoeh.antennapod.asynctask.DownloadObserver; import de.danoeh.antennapod.asynctask.DownloadStatus; @@ -104,12 +104,12 @@ public class AddFeedActivity extends SherlockActivity { StorageUtils.checkStorageAvailability(this); Intent intent = getIntent(); if (intent.getAction() != null && intent.getAction().equals(Intent.ACTION_SEND)) { - if (BuildConfig.DEBUG) Log.d(TAG, "Was started with ACTION_SEND intent"); + if (AppConfig.DEBUG) Log.d(TAG, "Was started with ACTION_SEND intent"); String text = intent.getStringExtra(Intent.EXTRA_TEXT); if (text != null) { etxtFeedurl.setText(text); } else { - if (BuildConfig.DEBUG) Log.d(TAG, "No text was sent"); + if (AppConfig.DEBUG) Log.d(TAG, "No text was sent"); } } @@ -118,7 +118,7 @@ public class AddFeedActivity extends SherlockActivity { @Override protected void onStop() { super.onStop(); - if (BuildConfig.DEBUG) Log.d(TAG, "Stopping Activity"); + if (AppConfig.DEBUG) Log.d(TAG, "Stopping Activity"); } @Override diff --git a/src/de/danoeh/antennapod/activity/DownloadActivity.java b/src/de/danoeh/antennapod/activity/DownloadActivity.java index 2b72b86b8..8dc029e75 100644 --- a/src/de/danoeh/antennapod/activity/DownloadActivity.java +++ b/src/de/danoeh/antennapod/activity/DownloadActivity.java @@ -7,7 +7,7 @@ import de.danoeh.antennapod.feed.FeedFile; import de.danoeh.antennapod.feed.FeedMedia; import de.danoeh.antennapod.service.DownloadService; import de.danoeh.antennapod.storage.DownloadRequester; -import de.danoeh.antennapod.BuildConfig; +import de.danoeh.antennapod.AppConfig; import de.danoeh.antennapod.R; import com.actionbarsherlock.app.SherlockListActivity; import com.actionbarsherlock.view.ActionMode; @@ -43,7 +43,7 @@ public class DownloadActivity extends SherlockListActivity implements @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - if (BuildConfig.DEBUG) Log.d(TAG, "Creating Activity"); + if (AppConfig.DEBUG) Log.d(TAG, "Creating Activity"); requester = DownloadRequester.getInstance(); getSupportActionBar().setDisplayHomeAsUpEnabled(true); @@ -61,14 +61,14 @@ public class DownloadActivity extends SherlockListActivity implements @Override protected void onResume() { super.onResume(); - if (BuildConfig.DEBUG) Log.d(TAG, "Trying to bind service"); + if (AppConfig.DEBUG) Log.d(TAG, "Trying to bind service"); bindService(new Intent(this, DownloadService.class), mConnection, 0); } @Override protected void onStop() { super.onStop(); - if (BuildConfig.DEBUG) Log.d(TAG, "Stopping Activity"); + if (AppConfig.DEBUG) Log.d(TAG, "Stopping Activity"); } @Override @@ -162,7 +162,7 @@ public class DownloadActivity extends SherlockListActivity implements public void onServiceConnected(ComponentName className, IBinder service) { downloadService = ((DownloadService.LocalBinder) service) .getService(); - if (BuildConfig.DEBUG) Log.d(TAG, "Connection to service established"); + if (AppConfig.DEBUG) Log.d(TAG, "Connection to service established"); dla = new DownloadlistAdapter(DownloadActivity.this, 0, downloadService.getDownloadObserver().getStatusList()); setListAdapter(dla); @@ -184,7 +184,7 @@ public class DownloadActivity extends SherlockListActivity implements @Override public void onFinish() { - if (BuildConfig.DEBUG) Log.d(TAG, "Observer has finished, clearing adapter"); + if (AppConfig.DEBUG) Log.d(TAG, "Observer has finished, clearing adapter"); dla.clear(); dla.notifyDataSetInvalidated(); } diff --git a/src/de/danoeh/antennapod/activity/FeedInfoActivity.java b/src/de/danoeh/antennapod/activity/FeedInfoActivity.java index 9b0915bb3..8dcdcc3d3 100644 --- a/src/de/danoeh/antennapod/activity/FeedInfoActivity.java +++ b/src/de/danoeh/antennapod/activity/FeedInfoActivity.java @@ -15,7 +15,7 @@ import de.danoeh.antennapod.feed.Feed; import de.danoeh.antennapod.feed.FeedManager; import de.danoeh.antennapod.util.FeedMenuHandler; import de.danoeh.antennapod.util.LangUtils; -import de.danoeh.antennapod.BuildConfig; +import de.danoeh.antennapod.AppConfig; import de.danoeh.antennapod.R; /** Displays information about a feed. */ @@ -41,8 +41,8 @@ public class FeedInfoActivity extends SherlockActivity { FeedManager manager = FeedManager.getInstance(); feed = manager.getFeed(feedId); if (feed != null) { - if (BuildConfig.DEBUG) Log.d(TAG, "Language is " + feed.getLanguage()); - if (BuildConfig.DEBUG) Log.d(TAG, "Author is " + feed.getAuthor()); + if (AppConfig.DEBUG) Log.d(TAG, "Language is " + feed.getLanguage()); + if (AppConfig.DEBUG) Log.d(TAG, "Author is " + feed.getAuthor()); imgvCover = (ImageView) findViewById(R.id.imgvCover); txtvTitle = (TextView) findViewById(R.id.txtvTitle); txtvDescription = (TextView) findViewById(R.id.txtvDescription); diff --git a/src/de/danoeh/antennapod/activity/FlattrAuthActivity.java b/src/de/danoeh/antennapod/activity/FlattrAuthActivity.java index e73c3daac..39ddd301f 100644 --- a/src/de/danoeh/antennapod/activity/FlattrAuthActivity.java +++ b/src/de/danoeh/antennapod/activity/FlattrAuthActivity.java @@ -16,7 +16,7 @@ import com.actionbarsherlock.view.Menu; import com.actionbarsherlock.view.MenuItem; import de.danoeh.antennapod.util.FlattrUtils; -import de.danoeh.antennapod.BuildConfig; +import de.danoeh.antennapod.AppConfig; import de.danoeh.antennapod.R; /** Guides the user through the authentication process */ @@ -36,7 +36,7 @@ public class FlattrAuthActivity extends SherlockActivity { super.onCreate(savedInstanceState); singleton = this; authSuccessful = false; - if (BuildConfig.DEBUG) Log.d(TAG, "Activity created"); + if (AppConfig.DEBUG) Log.d(TAG, "Activity created"); getSupportActionBar().setDisplayHomeAsUpEnabled(true); setContentView(R.layout.flattr_auth); txtvExplanation = (TextView) findViewById(R.id.txtvExplanation); @@ -70,10 +70,10 @@ public class FlattrAuthActivity extends SherlockActivity { @Override protected void onResume() { super.onResume(); - if (BuildConfig.DEBUG) Log.d(TAG, "Activity resumed"); + if (AppConfig.DEBUG) Log.d(TAG, "Activity resumed"); Uri uri = getIntent().getData(); if (uri != null) { - if (BuildConfig.DEBUG) Log.d(TAG, "Received uri"); + if (AppConfig.DEBUG) Log.d(TAG, "Received uri"); FlattrUtils.handleCallback(this, uri); } } diff --git a/src/de/danoeh/antennapod/activity/ItemviewActivity.java b/src/de/danoeh/antennapod/activity/ItemviewActivity.java index 4bf05e6ea..5fed8372f 100644 --- a/src/de/danoeh/antennapod/activity/ItemviewActivity.java +++ b/src/de/danoeh/antennapod/activity/ItemviewActivity.java @@ -24,7 +24,7 @@ import de.danoeh.antennapod.fragment.ItemDescriptionFragment; import de.danoeh.antennapod.fragment.ItemlistFragment; import de.danoeh.antennapod.util.FeedItemMenuHandler; import de.danoeh.antennapod.util.StorageUtils; -import de.danoeh.antennapod.BuildConfig; +import de.danoeh.antennapod.AppConfig; import de.danoeh.antennapod.R; /** Displays a single FeedItem and provides various actions */ @@ -59,7 +59,7 @@ public class ItemviewActivity extends SherlockFragmentActivity { @Override public void onStop() { super.onStop(); - if (BuildConfig.DEBUG) Log.d(TAG, "Stopping Activity"); + if (AppConfig.DEBUG) Log.d(TAG, "Stopping Activity"); } /** Extracts FeedItem object the activity is supposed to display */ @@ -73,8 +73,8 @@ public class ItemviewActivity extends SherlockFragmentActivity { } Feed feed = manager.getFeed(feedId); item = manager.getFeedItem(itemId, feed); - if (BuildConfig.DEBUG) Log.d(TAG, "Title of item is " + item.getTitle()); - if (BuildConfig.DEBUG) Log.d(TAG, "Title of feed is " + item.getFeed().getTitle()); + if (AppConfig.DEBUG) Log.d(TAG, "Title of item is " + item.getTitle()); + if (AppConfig.DEBUG) Log.d(TAG, "Title of feed is " + item.getFeed().getTitle()); } private void populateUI() { diff --git a/src/de/danoeh/antennapod/activity/MainActivity.java b/src/de/danoeh/antennapod/activity/MainActivity.java index ae7e1a27a..b58ac3cd4 100644 --- a/src/de/danoeh/antennapod/activity/MainActivity.java +++ b/src/de/danoeh/antennapod/activity/MainActivity.java @@ -25,7 +25,7 @@ import de.danoeh.antennapod.fragment.UnreadItemlistFragment; import de.danoeh.antennapod.service.DownloadService; import de.danoeh.antennapod.storage.DownloadRequester; import de.danoeh.antennapod.util.StorageUtils; -import de.danoeh.antennapod.BuildConfig; +import de.danoeh.antennapod.AppConfig; import de.danoeh.antennapod.R; public class MainActivity extends SherlockFragmentActivity { @@ -72,7 +72,7 @@ public class MainActivity extends SherlockFragmentActivity { private BroadcastReceiver contentUpdate = new BroadcastReceiver() { @Override public void onReceive(Context context, Intent intent) { - if (BuildConfig.DEBUG) Log.d(TAG, "Received contentUpdate Intent."); + if (AppConfig.DEBUG) Log.d(TAG, "Received contentUpdate Intent."); updateProgressBarVisibility(); } }; diff --git a/src/de/danoeh/antennapod/activity/MediaplayerActivity.java b/src/de/danoeh/antennapod/activity/MediaplayerActivity.java index 35a86d402..f5496a9da 100644 --- a/src/de/danoeh/antennapod/activity/MediaplayerActivity.java +++ b/src/de/danoeh/antennapod/activity/MediaplayerActivity.java @@ -41,7 +41,7 @@ import com.actionbarsherlock.view.MenuInflater; import com.actionbarsherlock.view.MenuItem; import com.viewpagerindicator.TabPageIndicator; -import de.danoeh.antennapod.BuildConfig; +import de.danoeh.antennapod.AppConfig; import de.danoeh.antennapod.PodcastApp; import de.danoeh.antennapod.R; import de.danoeh.antennapod.feed.FeedManager; @@ -98,7 +98,7 @@ public class MediaplayerActivity extends SherlockFragmentActivity implements @Override protected void onStop() { super.onStop(); - if (BuildConfig.DEBUG) Log.d(TAG, "Activity stopped"); + if (AppConfig.DEBUG) Log.d(TAG, "Activity stopped"); try { unregisterReceiver(statusUpdate); } catch (IllegalArgumentException e) { @@ -157,7 +157,7 @@ public class MediaplayerActivity extends SherlockFragmentActivity implements @Override protected void onResume() { super.onResume(); - if (BuildConfig.DEBUG) Log.d(TAG, "Resuming Activity"); + if (AppConfig.DEBUG) Log.d(TAG, "Resuming Activity"); StorageUtils.checkStorageAvailability(this); bindToService(); @@ -166,7 +166,7 @@ public class MediaplayerActivity extends SherlockFragmentActivity implements @Override public void onConfigurationChanged(Configuration newConfig) { super.onConfigurationChanged(newConfig); - if (BuildConfig.DEBUG) Log.d(TAG, "Configuration changed"); + if (AppConfig.DEBUG) Log.d(TAG, "Configuration changed"); orientation = newConfig.orientation; if (positionObserver != null) { positionObserver.cancel(true); @@ -192,7 +192,7 @@ public class MediaplayerActivity extends SherlockFragmentActivity implements @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - if (BuildConfig.DEBUG) Log.d(TAG, "Creating Activity"); + if (AppConfig.DEBUG) Log.d(TAG, "Creating Activity"); StorageUtils.checkStorageAvailability(this); orientation = getResources().getConfiguration().orientation; @@ -206,7 +206,7 @@ public class MediaplayerActivity extends SherlockFragmentActivity implements Intent serviceIntent = new Intent(this, PlaybackService.class); boolean bound = false; if (!PlaybackService.isRunning) { - if (BuildConfig.DEBUG) Log.d(TAG, "Trying to restore last played media"); + if (AppConfig.DEBUG) Log.d(TAG, "Trying to restore last played media"); SharedPreferences prefs = getApplicationContext() .getSharedPreferences(PodcastApp.PREF_NAME, 0); long mediaId = prefs.getLong(PlaybackService.PREF_LAST_PLAYED_ID, @@ -225,7 +225,7 @@ public class MediaplayerActivity extends SherlockFragmentActivity implements bound = bindService(serviceIntent, mConnection, Context.BIND_AUTO_CREATE); } else { - if (BuildConfig.DEBUG) Log.d(TAG, "No last played media found"); + if (AppConfig.DEBUG) Log.d(TAG, "No last played media found"); status = PlayerStatus.STOPPED; setupGUI(); handleStatus(); @@ -233,7 +233,7 @@ public class MediaplayerActivity extends SherlockFragmentActivity implements } else { bound = bindService(serviceIntent, mConnection, 0); } - if (BuildConfig.DEBUG) Log.d(TAG, "Result for service binding: " + bound); + if (AppConfig.DEBUG) Log.d(TAG, "Result for service binding: " + bound); } private void handleStatus() { @@ -273,7 +273,7 @@ public class MediaplayerActivity extends SherlockFragmentActivity implements setStatusMsg(R.string.player_seeking_msg, View.VISIBLE); break; case AWAITING_VIDEO_SURFACE: - if (BuildConfig.DEBUG) Log.d(TAG, "Preparing video playback"); + if (AppConfig.DEBUG) Log.d(TAG, "Preparing video playback"); this.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE); } } @@ -290,7 +290,7 @@ public class MediaplayerActivity extends SherlockFragmentActivity implements @SuppressLint("NewApi") private void setupPositionObserver() { if (positionObserver == null || positionObserver.isCancelled()) { - if (BuildConfig.DEBUG) Log.d(TAG, "Setting up position observer"); + if (AppConfig.DEBUG) Log.d(TAG, "Setting up position observer"); positionObserver = new MediaPositionObserver() { @Override @@ -318,7 +318,7 @@ public class MediaplayerActivity extends SherlockFragmentActivity implements } private void updateProgressbarPosition() { - if (BuildConfig.DEBUG) Log.d(TAG, "Updating progressbar info"); + if (AppConfig.DEBUG) Log.d(TAG, "Updating progressbar info"); MediaPlayer player = playbackService.getPlayer(); float progress = ((float) player.getCurrentPosition()) / player.getDuration(); @@ -327,7 +327,7 @@ public class MediaplayerActivity extends SherlockFragmentActivity implements private void loadMediaInfo() { if (!mediaInfoLoaded) { - if (BuildConfig.DEBUG) Log.d(TAG, "Loading media info"); + if (AppConfig.DEBUG) Log.d(TAG, "Loading media info"); if (media != null) { getSupportActionBar().setSubtitle(media.getItem().getTitle()); getSupportActionBar().setTitle( @@ -525,13 +525,13 @@ public class MediaplayerActivity extends SherlockFragmentActivity implements PlaybackService.ACTION_PLAYER_NOTIFICATION)); queryService(); - if (BuildConfig.DEBUG) Log.d(TAG, "Connection to Service established"); + if (AppConfig.DEBUG) Log.d(TAG, "Connection to Service established"); } @Override public void onServiceDisconnected(ComponentName name) { playbackService = null; - if (BuildConfig.DEBUG) Log.d(TAG, "Disconnected from Service"); + if (AppConfig.DEBUG) Log.d(TAG, "Disconnected from Service"); } }; @@ -541,7 +541,7 @@ public class MediaplayerActivity extends SherlockFragmentActivity implements * information has to be refreshed */ private void queryService() { - if (BuildConfig.DEBUG) Log.d(TAG, "Querying service info"); + if (AppConfig.DEBUG) Log.d(TAG, "Querying service info"); if (playbackService != null) { int requestedOrientation; status = playbackService.getStatus(); @@ -558,11 +558,11 @@ public class MediaplayerActivity extends SherlockFragmentActivity implements // check if orientation is correct if ((requestedOrientation == ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE && orientation == Configuration.ORIENTATION_LANDSCAPE) || (requestedOrientation == ActivityInfo.SCREEN_ORIENTATION_PORTRAIT && orientation == Configuration.ORIENTATION_PORTRAIT)) { - if (BuildConfig.DEBUG) Log.d(TAG, "Orientation correct"); + if (AppConfig.DEBUG) Log.d(TAG, "Orientation correct"); setupGUI(); handleStatus(); } else { - if (BuildConfig.DEBUG) Log.d(TAG, + if (AppConfig.DEBUG) Log.d(TAG, "Orientation incorrect, waiting for orientation change"); } } else { @@ -574,7 +574,7 @@ public class MediaplayerActivity extends SherlockFragmentActivity implements private BroadcastReceiver statusUpdate = new BroadcastReceiver() { @Override public void onReceive(Context context, Intent intent) { - if (BuildConfig.DEBUG) Log.d(TAG, "Received statusUpdate Intent."); + if (AppConfig.DEBUG) Log.d(TAG, "Received statusUpdate Intent."); status = playbackService.getStatus(); handleStatus(); } @@ -612,7 +612,7 @@ public class MediaplayerActivity extends SherlockFragmentActivity implements } } else { - if (BuildConfig.DEBUG) Log.d(TAG, "Bad arguments. Won't handle intent"); + if (AppConfig.DEBUG) Log.d(TAG, "Bad arguments. Won't handle intent"); } } @@ -630,7 +630,7 @@ public class MediaplayerActivity extends SherlockFragmentActivity implements @Override public void surfaceCreated(SurfaceHolder holder) { holderCreated = true; - if (BuildConfig.DEBUG) Log.d(TAG, "Videoview holder created"); + if (AppConfig.DEBUG) Log.d(TAG, "Videoview holder created"); if (status == PlayerStatus.AWAITING_VIDEO_SURFACE) { if (playbackService != null) { playbackService.setVideoSurface(holder); @@ -719,19 +719,19 @@ public class MediaplayerActivity extends SherlockFragmentActivity implements @Override protected void onCancelled() { - if (BuildConfig.DEBUG) Log.d(TAG, "Task was cancelled"); + if (AppConfig.DEBUG) Log.d(TAG, "Task was cancelled"); } @Override protected Void doInBackground(MediaPlayer... p) { - if (BuildConfig.DEBUG) Log.d(TAG, "Background Task started"); + if (AppConfig.DEBUG) Log.d(TAG, "Background Task started"); player = p[0]; try { while (player.isPlaying() && !isCancelled()) { try { Thread.sleep(WAITING_INTERVALL); } catch (InterruptedException e) { - if (BuildConfig.DEBUG) Log.d(TAG, + if (AppConfig.DEBUG) Log.d(TAG, "Thread was interrupted while waiting. Finishing now"); return null; } @@ -739,9 +739,9 @@ public class MediaplayerActivity extends SherlockFragmentActivity implements } } catch (IllegalStateException e) { - if (BuildConfig.DEBUG) Log.d(TAG, "player is in illegal state, exiting now"); + if (AppConfig.DEBUG) Log.d(TAG, "player is in illegal state, exiting now"); } - if (BuildConfig.DEBUG) Log.d(TAG, "Background Task finished"); + if (AppConfig.DEBUG) Log.d(TAG, "Background Task finished"); return null; } } @@ -764,7 +764,7 @@ public class MediaplayerActivity extends SherlockFragmentActivity implements @Override protected void onProgressUpdate(Void... values) { if (videoControlsShowing) { - if (BuildConfig.DEBUG) Log.d(TAG, "Hiding video controls"); + if (AppConfig.DEBUG) Log.d(TAG, "Hiding video controls"); getSupportActionBar().hide(); videoOverlay.setVisibility(View.GONE); videoControlsShowing = false; diff --git a/src/de/danoeh/antennapod/activity/StorageErrorActivity.java b/src/de/danoeh/antennapod/activity/StorageErrorActivity.java index 2974fa877..ac75c2e19 100644 --- a/src/de/danoeh/antennapod/activity/StorageErrorActivity.java +++ b/src/de/danoeh/antennapod/activity/StorageErrorActivity.java @@ -10,7 +10,7 @@ import android.util.Log; import com.actionbarsherlock.app.SherlockActivity; import de.danoeh.antennapod.util.StorageUtils; -import de.danoeh.antennapod.BuildConfig; +import de.danoeh.antennapod.AppConfig; import de.danoeh.antennapod.R; public class StorageErrorActivity extends SherlockActivity { @@ -54,10 +54,10 @@ public class StorageErrorActivity extends SherlockActivity { public void onReceive(Context context, Intent intent) { if (intent.getAction().equals(Intent.ACTION_MEDIA_MOUNTED)) { if (intent.getBooleanExtra("read-only", true)) { - if (BuildConfig.DEBUG) Log.d(TAG, "Media was mounted; Finishing activity"); + if (AppConfig.DEBUG) Log.d(TAG, "Media was mounted; Finishing activity"); leaveErrorState(); } else { - if (BuildConfig.DEBUG) Log.d(TAG, "Media seemed to have been mounted read only"); + if (AppConfig.DEBUG) Log.d(TAG, "Media seemed to have been mounted read only"); } } } |