# HG changeset patch # User Medo # Date 1333219159 -7200 # Node ID 2e6391f33204a9d3dc77d1b0f3f9906d0038afe5 # Parent c61f842621b897dbf97e58c16136d9e7c26e4be8 Removed some unused imports and a redundand nullcheck diff -r c61f842621b8 -r 2e6391f33204 project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/Downloader/DownloadAsyncTask.java --- a/project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/Downloader/DownloadAsyncTask.java Sat Mar 31 20:36:03 2012 +0200 +++ b/project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/Downloader/DownloadAsyncTask.java Sat Mar 31 20:39:19 2012 +0200 @@ -107,7 +107,7 @@ entry = input.getNextEntry(); }catch(IOException e){ e.printStackTrace(); - if(conn != null) conn.disconnect(); + conn.disconnect(); return EXIT_CONNERROR; } diff -r c61f842621b8 -r 2e6391f33204 project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/Downloader/DownloadListActivity.java --- a/project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/Downloader/DownloadListActivity.java Sat Mar 31 20:36:03 2012 +0200 +++ b/project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/Downloader/DownloadListActivity.java Sat Mar 31 20:39:19 2012 +0200 @@ -6,7 +6,6 @@ import android.support.v4.app.FragmentActivity; import android.support.v4.app.FragmentManager; import android.support.v4.app.FragmentTransaction; -import android.util.Log; import android.view.Gravity; import android.view.View; import android.view.View.OnClickListener; diff -r c61f842621b8 -r 2e6391f33204 project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/Downloader/DownloadPackage.java --- a/project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/Downloader/DownloadPackage.java Sat Mar 31 20:36:03 2012 +0200 +++ b/project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/Downloader/DownloadPackage.java Sat Mar 31 20:39:19 2012 +0200 @@ -29,7 +29,6 @@ import android.os.Parcel; import android.os.Parcelable; import android.preference.PreferenceManager; -import android.util.Log; public class DownloadPackage implements Parcelable{ private String url_without_suffix; diff -r c61f842621b8 -r 2e6391f33204 project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/MainActivity.java --- a/project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/MainActivity.java Sat Mar 31 20:36:03 2012 +0200 +++ b/project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/MainActivity.java Sat Mar 31 20:39:19 2012 +0200 @@ -26,7 +26,6 @@ import android.app.ProgressDialog; import android.content.DialogInterface; import android.content.Intent; -import android.content.pm.PackageInfo; import android.content.pm.PackageManager.NameNotFoundException; import android.os.Bundle; import android.preference.PreferenceManager; diff -r c61f842621b8 -r 2e6391f33204 project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/StartGameActivity.java --- a/project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/StartGameActivity.java Sat Mar 31 20:36:03 2012 +0200 +++ b/project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/StartGameActivity.java Sat Mar 31 20:39:19 2012 +0200 @@ -29,11 +29,9 @@ import android.app.Activity; import android.content.Intent; -import android.content.SharedPreferences; import android.graphics.drawable.Drawable; import android.os.Bundle; import android.os.Parcelable; -import android.preference.PreferenceManager; import android.view.View; import android.view.View.OnClickListener; import android.widget.AdapterView; diff -r c61f842621b8 -r 2e6391f33204 project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/TeamCreatorActivity.java --- a/project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/TeamCreatorActivity.java Sat Mar 31 20:36:03 2012 +0200 +++ b/project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/TeamCreatorActivity.java Sat Mar 31 20:39:19 2012 +0200 @@ -311,7 +311,7 @@ imgFort.setImageDrawable(fortIconDrawable); scroller.fullScroll(ScrollView.FOCUS_DOWN);// Scroll the scrollview // to the bottom, work - // around for scollview + // around for scrollview // invalidation (scrolls // back to top) }