From 3eebe3eae097ebe452099e8758a3acb28be8e303 Mon Sep 17 00:00:00 2001
From: Alan SCHNEIDER <shk.schneider@gmail.com>
Date: Sun, 22 Apr 2012 21:36:58 +0200
Subject: [PATCH] * Fix github link: leonnib4 -> shkschneider * Compatibility
 commit   * match_parent -> fill_parent   * Fix @Overrides   * Fix .R imports

---
 .settings/org.eclipse.jdt.core.prefs          |  5 +++++
 res/layout/about.xml                          |  4 ++--
 res/layout/server.xml                         | 22 +++++++++----------
 .../dropbearserver/CheckAction.java           |  4 ++--
 .../dropbearserver/HomeAction.java            |  4 ++--
 .../dropbearserver/MainAdapter.java           |  6 ++---
 .../dropbearserver/Pages/AboutPage.java       |  4 ++--
 .../dropbearserver/Pages/HelpPage.java        |  6 ++---
 .../dropbearserver/Pages/ServerPage.java      |  7 +-----
 .../dropbearserver/Pages/SettingsPage.java    |  6 ++---
 .../Tasks/DropbearInstaller.java              |  2 +-
 .../dropbearserver/Utils/RootUtils.java       |  2 ++
 .../dropbearserver/Utils/ShellUtils.java      |  1 +
 .../dropbearserver/Utils/Utils.java           |  2 ++
 14 files changed, 38 insertions(+), 37 deletions(-)
 create mode 100644 .settings/org.eclipse.jdt.core.prefs

diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..de4dfe5
--- /dev/null
+++ b/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,5 @@
+#Sun Apr 22 01:32:16 CEST 2012
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.source=1.5
diff --git a/res/layout/about.xml b/res/layout/about.xml
index e811982..35e1147 100644
--- a/res/layout/about.xml
+++ b/res/layout/about.xml
@@ -50,7 +50,7 @@
                 android:layout_height="wrap_content"
                 android:gravity="center_horizontal"
                 android:singleLine="false"
-                android:text="Released under the GNU General Public License 2.\nSource code available at leonnib4@github."
+                android:text="Released under the GNU General Public License 2.\nSource code available at shkschneider@github."
                 android:textColor="@color/white" />
         </LinearLayout>
 
@@ -110,7 +110,7 @@
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
                 android:gravity="center_horizontal"
-                android:text="shk.schneider" />
+                android:text="shkschneider" />
 
             <TextView
                 style="@style/content_page_small_text"
diff --git a/res/layout/server.xml b/res/layout/server.xml
index 076a449..02e59a6 100644
--- a/res/layout/server.xml
+++ b/res/layout/server.xml
@@ -10,7 +10,7 @@
 
     <LinearLayout
         style="@style/list_item_single"
-        android:layout_width="match_parent"
+        android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="5dp"
         android:clickable="false"
@@ -24,7 +24,7 @@
 
         <TextView
             android:id="@+id/superuser_status"
-            android:layout_width="match_parent"
+            android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:gravity="right"
             android:text=""
@@ -35,7 +35,7 @@
     <LinearLayout
         android:id="@+id/get_superuser"
         style="@style/list_item_single"
-        android:layout_width="match_parent"
+        android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:clickable="true"
         android:orientation="horizontal"
@@ -64,7 +64,7 @@
     <LinearLayout
         android:id="@+id/get_busybox"
         style="@style/list_item_single"
-        android:layout_width="match_parent"
+        android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:clickable="true"
         android:orientation="horizontal"
@@ -92,7 +92,7 @@
 
     <LinearLayout
         style="@style/list_item_single"
-        android:layout_width="match_parent"
+        android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="5dp"
         android:clickable="false"
@@ -106,7 +106,7 @@
 
         <TextView
             android:id="@+id/dropbear_status"
-            android:layout_width="match_parent"
+            android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:gravity="right"
             android:text=""
@@ -117,7 +117,7 @@
     <LinearLayout
         android:id="@+id/get_dropbear"
         style="@style/list_item_single"
-        android:layout_width="match_parent"
+        android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:clickable="true"
         android:orientation="horizontal"
@@ -145,7 +145,7 @@
 
     <LinearLayout
         style="@style/list_item_single"
-        android:layout_width="match_parent"
+        android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="5dp"
         android:clickable="false"
@@ -159,7 +159,7 @@
 
         <TextView
             android:id="@+id/server_status"
-            android:layout_width="match_parent"
+            android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:gravity="right"
             android:text=""
@@ -168,7 +168,7 @@
     </LinearLayout>
 
     <LinearLayout
-        android:layout_width="match_parent"
+        android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:clickable="true"
         android:orientation="vertical" >
@@ -176,7 +176,7 @@
         <LinearLayout
             android:id="@+id/server_launch"
             style="@style/list_item_single"
-            android:layout_width="match_parent"
+            android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:clickable="true"
             android:orientation="horizontal" >
diff --git a/src/me/shkschneider/dropbearserver/CheckAction.java b/src/me/shkschneider/dropbearserver/CheckAction.java
index 9c304fa..5d812d2 100644
--- a/src/me/shkschneider/dropbearserver/CheckAction.java
+++ b/src/me/shkschneider/dropbearserver/CheckAction.java
@@ -5,6 +5,8 @@ package me.shkschneider.dropbearserver;
 
 import com.markupartist.android.widget.ActionBar.Action;
 
+import me.shkschneider.dropbearserver.R;
+
 import android.content.Context;
 import android.view.View;
 
@@ -16,12 +18,10 @@ class CheckAction implements Action {
 		mContext = context;
 	}
 	
-    @Override
     public int getDrawable() {
         return R.drawable.ic_launcher;
     }
 
-    @Override
     public void performAction(View view) {
     	((MainActivity) mContext).check();
     }
diff --git a/src/me/shkschneider/dropbearserver/HomeAction.java b/src/me/shkschneider/dropbearserver/HomeAction.java
index ea7701f..ad72b1b 100644
--- a/src/me/shkschneider/dropbearserver/HomeAction.java
+++ b/src/me/shkschneider/dropbearserver/HomeAction.java
@@ -5,6 +5,8 @@ package me.shkschneider.dropbearserver;
 
 import com.markupartist.android.widget.ActionBar.Action;
 
+import me.shkschneider.dropbearserver.R;
+
 import android.content.Context;
 import android.view.View;
 
@@ -16,12 +18,10 @@ class HomeAction implements Action {
 		mContext = context;
 	}
 	
-    @Override
     public int getDrawable() {
         return R.drawable.ic_launcher;
     }
 
-    @Override
     public void performAction(View view) {
     	((MainActivity) mContext).goToDefaultPage();
     }
diff --git a/src/me/shkschneider/dropbearserver/MainAdapter.java b/src/me/shkschneider/dropbearserver/MainAdapter.java
index ea9a780..9da5cab 100644
--- a/src/me/shkschneider/dropbearserver/MainAdapter.java
+++ b/src/me/shkschneider/dropbearserver/MainAdapter.java
@@ -3,19 +3,18 @@
  */
 package me.shkschneider.dropbearserver;
 
+import com.astuetz.viewpagertabs.ViewPagerTabProvider;
+
 import me.shkschneider.dropbearserver.Pages.AboutPage;
 import me.shkschneider.dropbearserver.Pages.HelpPage;
 import me.shkschneider.dropbearserver.Pages.ServerPage;
 import me.shkschneider.dropbearserver.Pages.SettingsPage;
-
 import android.content.Context;
 import android.os.Parcelable;
 import android.support.v4.view.PagerAdapter;
 import android.support.v4.view.ViewPager;
 import android.view.View;
 
-import com.astuetz.viewpagertabs.ViewPagerTabProvider;
-
 public class MainAdapter extends PagerAdapter implements ViewPagerTabProvider {
 
 	private static final int SETTINGS_INDEX = 0;
@@ -108,7 +107,6 @@ public class MainAdapter extends PagerAdapter implements ViewPagerTabProvider {
 	public void startUpdate(View container) {
 	}
 
-	@Override
 	public String getTitle(int position) {
 		final int len = mTitles.length;
 		return (position >= 0 && position < len ? mTitles[position] : "");
diff --git a/src/me/shkschneider/dropbearserver/Pages/AboutPage.java b/src/me/shkschneider/dropbearserver/Pages/AboutPage.java
index 509d6b0..e9b7c51 100644
--- a/src/me/shkschneider/dropbearserver/Pages/AboutPage.java
+++ b/src/me/shkschneider/dropbearserver/Pages/AboutPage.java
@@ -1,7 +1,8 @@
 package me.shkschneider.dropbearserver.Pages;
 
-import me.shkschneider.dropbearserver.R;
 import me.shkschneider.dropbearserver.Utils.Utils;
+import me.shkschneider.dropbearserver.R;
+
 import android.content.ActivityNotFoundException;
 import android.content.Context;
 import android.content.Intent;
@@ -46,7 +47,6 @@ public class AboutPage implements OnClickListener {
 		return mView;
 	}
 
-	@Override
 	public void onClick(View v) {
 		if (v == mRateThisApp) {
 			try {
diff --git a/src/me/shkschneider/dropbearserver/Pages/HelpPage.java b/src/me/shkschneider/dropbearserver/Pages/HelpPage.java
index 00db805..6134c11 100644
--- a/src/me/shkschneider/dropbearserver/Pages/HelpPage.java
+++ b/src/me/shkschneider/dropbearserver/Pages/HelpPage.java
@@ -1,6 +1,7 @@
 package me.shkschneider.dropbearserver.Pages;
 
 import me.shkschneider.dropbearserver.R;
+
 import android.content.Context;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -41,13 +42,12 @@ public class HelpPage implements OnClickListener {
 		return mView;
 	}
 
-	@Override
 	public void onClick(View v) {
 		if (v == mWhatIsRoot) {
-			mWhatisRootContent.setVisibility(mWhatisRootContent.getVisibility() == LinearLayout.VISIBLE ? LinearLayout.GONE : LinearLayout.VISIBLE);
+			mWhatisRootContent.setVisibility(mWhatisRootContent.getVisibility() == View.VISIBLE ? View.GONE : View.VISIBLE);
 		}
 		else if (v == mWhatIsDropbear) {
-			mWhatisDropbearContent.setVisibility(mWhatisDropbearContent.getVisibility() == LinearLayout.VISIBLE ? LinearLayout.GONE : LinearLayout.VISIBLE);
+			mWhatisDropbearContent.setVisibility(mWhatisDropbearContent.getVisibility() == View.VISIBLE ? View.GONE : View.VISIBLE);
 		}
 	}
 }
\ No newline at end of file
diff --git a/src/me/shkschneider/dropbearserver/Pages/ServerPage.java b/src/me/shkschneider/dropbearserver/Pages/ServerPage.java
index a8fa2b7..690971d 100644
--- a/src/me/shkschneider/dropbearserver/Pages/ServerPage.java
+++ b/src/me/shkschneider/dropbearserver/Pages/ServerPage.java
@@ -1,7 +1,6 @@
 package me.shkschneider.dropbearserver.Pages;
 
 import me.shkschneider.dropbearserver.MainActivity;
-import me.shkschneider.dropbearserver.R;
 import me.shkschneider.dropbearserver.Tasks.Checker;
 import me.shkschneider.dropbearserver.Tasks.CheckerCallback;
 import me.shkschneider.dropbearserver.Tasks.DropbearInstaller;
@@ -13,6 +12,7 @@ import me.shkschneider.dropbearserver.Tasks.ServerStopperCallback;
 import me.shkschneider.dropbearserver.Utils.RootUtils;
 import me.shkschneider.dropbearserver.Utils.ServerUtils;
 import me.shkschneider.dropbearserver.Utils.Utils;
+import me.shkschneider.dropbearserver.R;
 
 import android.content.ActivityNotFoundException;
 import android.content.Context;
@@ -178,7 +178,6 @@ public class ServerPage implements OnClickListener, DropbearInstallerCallback<Bo
 		return mView;
 	}
 
-	@Override
 	public void onClick(View v) {
 		if (v == mServerLaunch) {
 			switch (mServerStatusCode) {
@@ -239,7 +238,6 @@ public class ServerPage implements OnClickListener, DropbearInstallerCallback<Bo
 		}
 	}
 
-	@Override
 	public void onDropbearInstallerComplete(Boolean result) {
 		Log.i(TAG, "onDropbearInstallerComplete(" + result + ")");
 		if (result == true) {
@@ -250,7 +248,6 @@ public class ServerPage implements OnClickListener, DropbearInstallerCallback<Bo
 		}
 	}
 
-	@Override
 	public void onServerStarterComplete(Boolean result) {
 		Log.i(TAG, "onStartServerComplete(" + result + ")");
 		if (result == true) {
@@ -262,7 +259,6 @@ public class ServerPage implements OnClickListener, DropbearInstallerCallback<Bo
 		updateServerStatus();
 	}
 
-	@Override
 	public void onServerStopperComplete(Boolean result) {
 		Log.i(TAG, "onStopServerComplete(" + result + ")");
 		if (result == true) {
@@ -274,7 +270,6 @@ public class ServerPage implements OnClickListener, DropbearInstallerCallback<Bo
 		updateServerStatus();
 	}
 
-	@Override
 	public void onCheckerComplete(Boolean result) {
 		update();
     	((MainActivity) mContext).setActionBarProgressBarVisibility(View.GONE);
diff --git a/src/me/shkschneider/dropbearserver/Pages/SettingsPage.java b/src/me/shkschneider/dropbearserver/Pages/SettingsPage.java
index cd8df09..9c26c64 100644
--- a/src/me/shkschneider/dropbearserver/Pages/SettingsPage.java
+++ b/src/me/shkschneider/dropbearserver/Pages/SettingsPage.java
@@ -1,10 +1,11 @@
 package me.shkschneider.dropbearserver.Pages;
 
 import me.shkschneider.dropbearserver.MainActivity;
-import me.shkschneider.dropbearserver.R;
 import me.shkschneider.dropbearserver.Tasks.DropbearRemover;
 import me.shkschneider.dropbearserver.Tasks.DropbearRemoverCallback;
 import me.shkschneider.dropbearserver.Utils.RootUtils;
+import me.shkschneider.dropbearserver.R;
+
 import android.app.AlertDialog;
 import android.content.Context;
 import android.content.DialogInterface;
@@ -53,7 +54,6 @@ public class SettingsPage implements OnClickListener, DialogInterface.OnClickLis
 		return mView;
 	}
 
-	@Override
 	public void onClick(View v) {
 		// mGeneral
 		if (v == mGeneral) {
@@ -74,7 +74,6 @@ public class SettingsPage implements OnClickListener, DialogInterface.OnClickLis
 		}
 	}
 
-	@Override
 	public void onClick(DialogInterface dialog, int button) {
 		if (button == DialogInterface.BUTTON_POSITIVE) {
 			// mDropbearRemover
@@ -83,7 +82,6 @@ public class SettingsPage implements OnClickListener, DialogInterface.OnClickLis
 		}
 	}
 
-	@Override
 	public void onDropbearRemoverComplete(Boolean result) {
 		if (result == true) {
 			RootUtils.hasDropbear = false;
diff --git a/src/me/shkschneider/dropbearserver/Tasks/DropbearInstaller.java b/src/me/shkschneider/dropbearserver/Tasks/DropbearInstaller.java
index 28badfe..80a7a75 100644
--- a/src/me/shkschneider/dropbearserver/Tasks/DropbearInstaller.java
+++ b/src/me/shkschneider/dropbearserver/Tasks/DropbearInstaller.java
@@ -1,8 +1,8 @@
 package me.shkschneider.dropbearserver.Tasks;
 
-import me.shkschneider.dropbearserver.R;
 import me.shkschneider.dropbearserver.Utils.ShellUtils;
 import me.shkschneider.dropbearserver.Utils.Utils;
+import me.shkschneider.dropbearserver.R;
 
 import android.app.ProgressDialog;
 import android.content.Context;
diff --git a/src/me/shkschneider/dropbearserver/Utils/RootUtils.java b/src/me/shkschneider/dropbearserver/Utils/RootUtils.java
index 8acc75b..0287e50 100644
--- a/src/me/shkschneider/dropbearserver/Utils/RootUtils.java
+++ b/src/me/shkschneider/dropbearserver/Utils/RootUtils.java
@@ -1,7 +1,9 @@
 package me.shkschneider.dropbearserver.Utils;
 
 import java.util.concurrent.TimeoutException;
+
 import android.util.Log;
+
 import com.stericson.RootTools.RootTools;
 
 public abstract class RootUtils
diff --git a/src/me/shkschneider/dropbearserver/Utils/ShellUtils.java b/src/me/shkschneider/dropbearserver/Utils/ShellUtils.java
index 7fedd76..9be37f7 100644
--- a/src/me/shkschneider/dropbearserver/Utils/ShellUtils.java
+++ b/src/me/shkschneider/dropbearserver/Utils/ShellUtils.java
@@ -9,6 +9,7 @@ import java.io.IOException;
 import java.util.ArrayList;
 
 import android.util.Log;
+
 import com.stericson.RootTools.RootTools;
 
 public abstract class ShellUtils
diff --git a/src/me/shkschneider/dropbearserver/Utils/Utils.java b/src/me/shkschneider/dropbearserver/Utils/Utils.java
index d97d3d4..c68bc7e 100644
--- a/src/me/shkschneider/dropbearserver/Utils/Utils.java
+++ b/src/me/shkschneider/dropbearserver/Utils/Utils.java
@@ -4,9 +4,11 @@ import java.io.File;
 import java.io.FileOutputStream;
 import java.io.InputStream;
 import java.io.OutputStream;
+
 import android.content.Context;
 import android.util.Log;
 import android.widget.Toast;
+
 import com.stericson.RootTools.RootTools;
 
 public abstract class Utils