removed old http server stuff

SMSServer/src/main/AndroidManifest.xml

@@ -31,21 +31,11 @@
             </intent-filter>
         </activity>
 
-        <service
-            android:name="SMSServerService"
-            android:label="SMS Server Service"
-            android:permission="android.permission.WRITE_SMS">
-        </service>
-        <receiver android:name=".Receiver" android:exported="true" > 
+        <receiver android:name=".SMSReceiver" android:exported="true" >
 			<intent-filter android:priority="999">
 			  <action android:name="android.provider.Telephony.SMS_RECEIVED" />
 			</intent-filter>
 		</receiver>
-        <receiver android:name=".BootReceiver" android:exported="true" > 
-			<intent-filter>
-			  <action android:name="android.intent.action.BOOT_COMPLETED"/>
-			</intent-filter>
-		</receiver>
     </application>
 
 </manifest>

SMSServer/src/main/java/com/rob57530/smsserver/BootReceiver.java

@@ -1,19 +0,0 @@
-package com.rob57530.smsserver;
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.preference.PreferenceManager;
-
-public class BootReceiver extends BroadcastReceiver
-{
-	@Override
-	public void onReceive(Context context, Intent intent)
-	{
-		SharedPreferences p = PreferenceManager.getDefaultSharedPreferences(context);
-		if(p.getBoolean("boot", true))
-			context.startService(new Intent(context, SMSServerService.class));
-	}
-
-}

SMSServer/src/main/java/com/rob57530/smsserver/MainActivity.java

@@ -23,10 +23,7 @@ public class MainActivity extends Activity
 {
 	private Button m_btnStart;
 	private Button m_btnStop;
-	private EditText m_textPort;
 	private EditText m_textHttp;
-	private EditText m_textName;
-	private EditText m_textNumber;
 
 	@Override
 	protected void onCreate(Bundle savedInstanceState)
@@ -35,10 +32,7 @@ public class MainActivity extends Activity
 		setContentView(R.layout.activity_main);
 		m_btnStart = (Button) findViewById(R.id.btnStart);
 		m_btnStop = (Button) findViewById(R.id.btnStop);
-		m_textPort = (EditText) findViewById(R.id.editTextPort);
 		m_textHttp = (EditText) findViewById(R.id.editTextHttp);
-		m_textName = (EditText) findViewById(R.id.editTextName);
-		m_textNumber = (EditText) findViewById(R.id.editTextNumber);
 		m_btnStart.setOnClickListener(new View.OnClickListener()
 		{
 			@Override
@@ -55,97 +49,50 @@ public class MainActivity extends Activity
 				stopServer();
 			}
 		});
-		m_textName.setHint(Build.MODEL);
-		try
-		{
-			m_textNumber.setHint(((TelephonyManager) getSystemService(Context.TELEPHONY_SERVICE)).getLine1Number());
-		}
-		catch (Exception e)
-		{
-
-		}
 
 		final SharedPreferences p = PreferenceManager.getDefaultSharedPreferences(this);
 		m_textHttp.setText(p.getString("http", m_textHttp.getHint().toString()));
-		m_textName.setText(p.getString("name", m_textName.getHint().toString()));
-		m_textPort.setText("" + p.getInt("port", 8080));
-		m_textNumber.setText(p.getString("number", m_textNumber.getHint().toString()));
-
-		CheckBox checkBoot = ((CheckBox) findViewById(R.id.checkBoxBoot));
-		checkBoot.setChecked(p.getBoolean("boot", true));
-		checkBoot.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener()
-		{
-			@Override
-			public void onCheckedChanged(CompoundButton buttonView, boolean isChecked)
-			{
-				Editor e = p.edit();
-				e.putBoolean("boot", isChecked);
-				e.commit();
-			}
-		});
 
 		updateButtons();
-		startServer();
 	}
 
 	public void startServer()
 	{
-		int p = 0;
-		try
-		{
-			p = Integer.parseInt(m_textPort.getText().toString());
-		}
-		catch (Exception e)
-		{
-
-		}
 		String http = m_textHttp.getText().toString();
-		String name = m_textName.getText().toString();
-		String number = m_textNumber.getText().toString();
 
 		SharedPreferences pr = PreferenceManager.getDefaultSharedPreferences(this);
 		Editor edit = pr.edit();
 		edit.putString("http", http);
-		edit.putString("name", name);
-		edit.putInt("port", p);
-		edit.putString("number", number);
-		edit.commit();
 
 		try
 		{
-
 			if (http.length() == 0)
 				throw new Exception("Empty SMS Server");
-			if (name.length() == 0)
-				throw new Exception("Empty Name");
-			if (number.length() == 0)
-				throw new Exception("Empty Number");
-			if (p < 1 || p > 65535)
-				throw new Exception("Invalid Port (1 <= port <= 65535)");
 
-			startService(new Intent(MainActivity.this, SMSServerService.class));
-			updateButtons();
+            edit.putBoolean("running", true);
 
 		}
 		catch (Exception e)
 		{
 			Toast.makeText(this, "Error: " + e.getMessage(), Toast.LENGTH_LONG).show();
 		}
+        edit.commit();
+        updateButtons();
 	}
 
 	public void stopServer()
 	{
-		stopService(new Intent(MainActivity.this, SMSServerService.class));
+        SharedPreferences pr = PreferenceManager.getDefaultSharedPreferences(this);
+        Editor edit = pr.edit();
+        edit.putBoolean("running", false);
+        edit.commit();
 		updateButtons();
 	}
 
 	private boolean isServiceRunning()
 	{
-		ActivityManager manager = (ActivityManager) getSystemService(Context.ACTIVITY_SERVICE);
-		for (RunningServiceInfo service : manager.getRunningServices(Integer.MAX_VALUE))
-			if (SMSServerService.class.getName().equals(service.service.getClassName()))
-				return true;
-		return false;
+        SharedPreferences pr = PreferenceManager.getDefaultSharedPreferences(this);
+        return pr.getBoolean("running", false);
 	}
 
 	private void updateButtons()
@@ -153,17 +100,6 @@ public class MainActivity extends Activity
 		boolean is = isServiceRunning();
 		m_btnStart.setEnabled(!is);
 		m_btnStop.setEnabled(is);
-		m_textPort.setEnabled(!is);
 		m_textHttp.setEnabled(!is);
-		m_textName.setEnabled(!is);
-		m_textNumber.setEnabled(!is);
-	}
-
-	@Override
-	public boolean onCreateOptionsMenu(Menu menu)
-	{
-		getMenuInflater().inflate(R.menu.main, menu);
-		return true;
 	}
-
 }

SMSServer/src/main/java/com/rob57530/smsserver/Receiver.java → SMSServer/src/main/java/com/rob57530/smsserver/SMSReceiver.java

@@ -25,7 +25,7 @@ import android.telephony.SmsMessage;
 import android.util.Base64;
 import android.util.Log;
 
-public class Receiver extends BroadcastReceiver
+public class SMSReceiver extends BroadcastReceiver
 {
 
 	class RequestTask extends AsyncTask<String, String, String>
@@ -80,16 +80,10 @@ public class Receiver extends BroadcastReceiver
 	public void onReceive(Context context, Intent intent)
 	{
 		Log.d("SMSServerReceiver", "sms");
-		boolean running = false;
-		ActivityManager manager = (ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE);
-		for (RunningServiceInfo service : manager.getRunningServices(Integer.MAX_VALUE))
-			if (SMSServerService.class.getName().equals(service.service.getClassName()))
-			{
-				running = true;
-				break;
-			}
-		if(!running)
-			return;
+        SharedPreferences pr = PreferenceManager.getDefaultSharedPreferences(context);
+        if (!pr.getBoolean("running", false))
+            return;
+
 		Log.d("SMSServerReceiver", "sms (running)");
 		
 		SharedPreferences p = PreferenceManager.getDefaultSharedPreferences(context);

SMSServer/src/main/java/com/rob57530/smsserver/SMSServerService.java

@@ -1,228 +0,0 @@
-package com.rob57530.smsserver;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
-import java.util.Calendar;
-import java.util.Map;
-
-import org.apache.http.HttpResponse;
-import org.apache.http.HttpStatus;
-import org.apache.http.StatusLine;
-import org.apache.http.client.ClientProtocolException;
-import org.apache.http.client.HttpClient;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.impl.client.DefaultHttpClient;
-import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.util.ajax.JSON;
-
-import android.app.Notification;
-import android.app.NotificationManager;
-import android.app.PendingIntent;
-import android.app.Service;
-import android.content.Context;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.os.AsyncTask;
-import android.os.Handler;
-import android.os.IBinder;
-import android.preference.PreferenceManager;
-import android.support.v4.app.NotificationCompat;
-import android.util.Base64;
-import android.util.Log;
-
-public class SMSServerService extends Service
-{
-	private Server m_server = null;
-	private int m_port = 0;
-	private String m_http = null;
-	private String m_name = null;
-	private String m_number = null;
-	private int m_gateTimeout = -1;
-
-	private NotificationCompat.Builder m_builder = null;
-	private NotificationManager m_notificationManager = null;
-
-	private Handler m_handler = null;
-	private Runnable m_timer = new Runnable()
-	{
-		@Override
-		public void run()
-		{
-			register();
-		}
-	};
-
-	class RequestTask extends AsyncTask<String, String, String>
-	{
-		@Override
-		protected String doInBackground(String... uri)
-		{
-			Log.d("SMSServerService", "doinbackground");
-			HttpClient httpclient = new DefaultHttpClient();
-			HttpResponse response;
-			String responseString = null;
-			try
-			{
-				HttpGet get = new HttpGet(uri[0]);
-				get.setHeader("Host", m_http);
-				get.setHeader("Authorization", "Basic " + Base64.encodeToString("__gates__:gatespasswd".getBytes(), Base64.NO_WRAP));
-
-				response = httpclient.execute(get);
-				Log.d("SMSServerService", "doinbackground exec");
-				StatusLine statusLine = response.getStatusLine();
-				if (statusLine.getStatusCode() == HttpStatus.SC_OK)
-				{
-					ByteArrayOutputStream out = new ByteArrayOutputStream();
-					response.getEntity().writeTo(out);
-					out.close();
-					responseString = out.toString();
-				}
-				else
-				{
-					response.getEntity().getContent().close();
-					throw new IOException(statusLine.getReasonPhrase());
-				}
-			}
-			catch (ClientProtocolException e)
-			{
-				Log.d("SMSServerService", "doinbackground:" + e.toString());
-				e.printStackTrace();
-			}
-			catch (IOException e)
-			{
-				Log.d("SMSServerService", "doinbackground:" + e.toString());
-				e.printStackTrace();
-			}
-			Log.d("SMSServerService", "doinbackground end");
-			return responseString;
-		}
-
-		@Override
-		protected void onPostExecute(String result)
-		{
-			super.onPostExecute(result);
-			if (result != null)
-			{
-				@SuppressWarnings("unchecked")
-				Map<String, Object> root = (Map<String, Object>) JSON.parse(result);
-				if (root.containsKey("error"))
-				{
-					m_gateTimeout = 30;
-					Log.w("SMSServer", root.get("error").toString());
-					setText("Error: " + root.get("error").toString());
-				}
-				else
-				{
-					m_gateTimeout = ((Long) root.get("gateTimeout")).intValue();
-					Log.d("SMSServerService", "" + m_gateTimeout);
-					setText("Registered. id=" + ((Long) root.get("id")).intValue() + " timeout=" + m_gateTimeout);
-				}
-			}
-			else
-			{
-				m_gateTimeout = 30;
-				setText("Error while registering");
-			}
-			m_handler.postDelayed(m_timer, Math.max((m_gateTimeout - 20) * 1000, 10000));
-		}
-	}
-
-	private void setText(String t)
-	{
-		m_builder.setContentText(t).setOngoing(true).setWhen(Calendar.getInstance().getTimeInMillis());
-		Notification n = m_builder.build();
-		m_notificationManager.notify(0, n);
-		startForeground(0, n);
-	}
-
-	@Override
-	public int onStartCommand(Intent intent, int flags, int startId)
-	{
-		if (m_server == null)
-		{
-			Intent i = new Intent(getApplicationContext(), MainActivity.class);
-			i.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP);
-			PendingIntent pi = PendingIntent.getActivity(this, 42, i, PendingIntent.FLAG_UPDATE_CURRENT);
-			m_builder = new NotificationCompat.Builder(this).setSmallIcon(R.drawable.network_wireless).setContentTitle("SMS Server").setContentIntent(pi);
-			m_notificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
-			setText("Starting...");
-			SharedPreferences p = PreferenceManager.getDefaultSharedPreferences(this);
-			m_port = p.getInt("port", 0);
-			m_http = p.getString("http", "");
-			m_name = p.getString("name", "");
-			m_number = p.getString("number", "");
-
-			try
-			{
-				if (m_name.length() == 0)
-					throw new Exception("Empty Name");
-				if (m_number.length() == 0)
-					throw new Exception("Empty Number");
-				if (m_port < 1 || m_port > 65535)
-					throw new Exception("Invalid Port (1 <= port <= 65535)");
-				m_handler = new Handler();
-				m_server = new Server(m_port);
-				HttpHandler h = new HttpHandler();
-				h.setContext(this);
-				h.setHttp(m_http);
-				m_server.setHandler(h);
-				m_server.start();
-				if (m_http.length() != 0)
-					register();
-			}
-			catch (Exception e)
-			{
-				e.printStackTrace();
-				setText("Error: " + e.getMessage());
-			}
-		}
-		return Service.START_REDELIVER_INTENT;
-	}
-
-	private void register()
-	{
-		try
-		{
-			setText("Registering...");
-			RequestTask r = new RequestTask();
-			r.execute("http://" + m_http + "/register.php?name=" + URLEncoder.encode(m_name, "utf-8") + "&number=" + URLEncoder.encode(m_number, "utf-8")
-					+ "&port=" + m_port);
-		}
-		catch (UnsupportedEncodingException e)
-		{
-			e.printStackTrace();
-		}
-	}
-
-	@Override
-	public void onDestroy()
-	{
-		m_handler.removeCallbacks(m_timer);
-		m_builder.setOngoing(false);
-		m_notificationManager.notify(0, m_builder.build());
-		stopForeground(false);
-		Log.d("SMSServerService", "stop");
-		if (m_server != null)
-		{
-			try
-			{
-				m_server.stop();
-			}
-			catch (Exception e)
-			{
-				e.printStackTrace();
-			}
-			m_server = null;
-		}
-		super.onDestroy();
-	}
-
-	@Override
-	public IBinder onBind(Intent arg0)
-	{
-		return null;
-	}
-
-}

SMSServer/src/main/res/layout/activity_main.xml

@@ -26,26 +26,14 @@
         android:layout_below="@+id/btnStart"
         android:text="@string/stop" />
 
-    <EditText
-        android:id="@+id/editTextPort"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignLeft="@+id/textViewPort"
-        android:layout_alignRight="@+id/textViewPort"
-        android:layout_below="@+id/textViewPort"
-        android:text="8080"
-        android:hint="8080"
-        android:ems="10"
-        android:inputType="number" />
-
     <TextView
         android:id="@+id/textViewHttp"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignLeft="@+id/editTextPort"
-        android:layout_alignRight="@+id/editTextPort"
-        android:layout_below="@+id/editTextPort"
-        android:text="SMS Server:" />
+        android:text="SMS Server:"
+        android:layout_alignLeft="@+id/btnStop"
+        android:layout_alignRight="@+id/btnStop"
+        android:layout_below="@+id/btnStop" />
 
     <EditText
         android:id="@+id/editTextHttp"
@@ -61,60 +49,4 @@
         <requestFocus />
     </EditText>
 
-    <TextView
-        android:id="@+id/textViewName"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignLeft="@+id/editTextHttp"
-        android:layout_alignRight="@+id/editTextHttp"
-        android:layout_below="@+id/editTextHttp"
-        android:text="Name:" />
-
-    <EditText
-        android:id="@+id/editTextName"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignLeft="@+id/textViewName"
-        android:layout_alignRight="@+id/textViewName"
-        android:layout_below="@+id/textViewName"
-        android:ems="10" />
-
-    <TextView
-        android:id="@+id/textViewNumber"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignLeft="@+id/editTextName"
-        android:layout_alignRight="@+id/editTextName"
-        android:layout_below="@+id/editTextName"
-        android:text="Phone Number:" />
-
-    <EditText
-        android:id="@+id/editTextNumber"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignLeft="@+id/textViewNumber"
-        android:layout_alignRight="@+id/textViewNumber"
-        android:layout_below="@+id/textViewNumber"
-        android:ems="10"
-        android:inputType="phone" />
-
-    <CheckBox
-        android:id="@+id/checkBoxBoot"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignLeft="@+id/btnStop"
-        android:layout_alignRight="@+id/btnStop"
-        android:layout_below="@+id/btnStop"
-        android:checked="true"
-        android:text="Start at Boot" />
-
-    <TextView
-        android:id="@+id/textViewPort"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignLeft="@+id/checkBoxBoot"
-        android:layout_alignRight="@+id/checkBoxBoot"
-        android:layout_below="@+id/checkBoxBoot"
-        android:text="Port:" />
-
 </RelativeLayout>

SMSServer/src/main/res/menu/main.xml

@@ -1,3 +0,0 @@
-<menu xmlns:android="http://schemas.android.com/apk/res/android" >
-
-</menu>