diff --git a/PieMessage-Android/app/src/main/AndroidManifest.xml b/PieMessage-Android/app/src/main/AndroidManifest.xml index 51d03d0..51a6d32 100644 --- a/PieMessage-Android/app/src/main/AndroidManifest.xml +++ b/PieMessage-Android/app/src/main/AndroidManifest.xml @@ -5,40 +5,35 @@ - + android:theme="@style/AppTheme.NoActionBar"> - - - - + android:theme="@style/AppTheme" + > - - + + + - \ No newline at end of file + diff --git a/PieMessage-Android/app/src/main/java/com/ericchee/bboyairwreck/piemessage/ChatsActivity.java b/PieMessage-Android/app/src/main/java/com/ericchee/bboyairwreck/piemessage/ChatsActivity.java index 54c308a..8cff5eb 100644 --- a/PieMessage-Android/app/src/main/java/com/ericchee/bboyairwreck/piemessage/ChatsActivity.java +++ b/PieMessage-Android/app/src/main/java/com/ericchee/bboyairwreck/piemessage/ChatsActivity.java @@ -27,8 +27,6 @@ public class ChatsActivity extends AppCompatActivity implements ReceiveMessagesS ReceiveMessagesService receiveMessagesService; private boolean boundReceiveService = false; - private static final int SETTINGS_RESULT = 1; - @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -150,8 +148,6 @@ public boolean onOptionsItemSelected(MenuItem item) { //noinspection SimplifiableIfStatement if (id == R.id.action_settings) { - Intent piePreferenceIntent = new Intent(this, PiePreferenceActivity.class); - startActivityForResult(piePreferenceIntent, SETTINGS_RESULT); return true; } diff --git a/PieMessage-Android/app/src/main/java/com/ericchee/bboyairwreck/piemessage/Constants.java b/PieMessage-Android/app/src/main/java/com/ericchee/bboyairwreck/piemessage/Constants.java index 594a23a..ede1c36 100644 --- a/PieMessage-Android/app/src/main/java/com/ericchee/bboyairwreck/piemessage/Constants.java +++ b/PieMessage-Android/app/src/main/java/com/ericchee/bboyairwreck/piemessage/Constants.java @@ -4,6 +4,8 @@ * Created by eric on 12/8/15. */ public class Constants { + public static final String socketAddress = "127.0.0.1"; // INSERT YOUR PUBLIC IP HERE linked to OSX Client + public static final String chatROWID = "chat_rowid"; public static final String chatHandlesString = "chatHandlesString"; } diff --git a/PieMessage-Android/app/src/main/java/com/ericchee/bboyairwreck/piemessage/MainActivity.java b/PieMessage-Android/app/src/main/java/com/ericchee/bboyairwreck/piemessage/MainActivity.java deleted file mode 100644 index c180302..0000000 --- a/PieMessage-Android/app/src/main/java/com/ericchee/bboyairwreck/piemessage/MainActivity.java +++ /dev/null @@ -1,90 +0,0 @@ -package com.ericchee.bboyairwreck.piemessage; - -import android.content.Intent; -import android.content.SharedPreferences; -import android.preference.PreferenceManager; -import android.support.v7.app.AppCompatActivity; -import android.os.Bundle; -import android.view.View; -import android.widget.Button; -import android.widget.EditText; -import android.widget.Toast; - -public class MainActivity extends AppCompatActivity { - private String prefSocketAddressKey; - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - final SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this); - this.prefSocketAddressKey = getString(R.string.pref_socket_address_key); - - // Check if Set IP Address - if (!sharedPreferences.contains(prefSocketAddressKey)) { - // Show IP Set up - setContentView(R.layout.activity_main); - sharedPreferences.getString(prefSocketAddressKey, "127.0.0.1"); - - Button btnStartPie = (Button) findViewById(R.id.btnStartPie); - btnStartPie.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - // Get value and - EditText etSocketAddress = (EditText) findViewById(R.id.etSocketAddress); - - // Check if IP is valid string - if (validIP(etSocketAddress.getText().toString().trim())) { - // Save preference - SharedPreferences.Editor editor = sharedPreferences.edit(); - editor.putString(prefSocketAddressKey, etSocketAddress.getText().toString().trim()); - editor.apply(); - - // Start ReceiveMessagesService and load ChatActivity - PieMessageApplication.getInstance().startReceieveMessagesService(); - startChatActivity(); - } else { - CharSequence text = "In valid IP address"; - Toast.makeText(MainActivity.this, text, Toast.LENGTH_SHORT).show(); - } - } - }); - } else { - // Load to ChatActivity - startChatActivity(); - } - - } - - public static boolean validIP (String ip) { - try { - if ( ip == null || ip.isEmpty() ) { - return false; - } - - String[] parts = ip.split( "\\." ); - if ( parts.length != 4 ) { - return false; - } - - for ( String s : parts ) { - int i = Integer.parseInt( s ); - if ( (i < 0) || (i > 255) ) { - return false; - } - } - if ( ip.endsWith(".") ) { - return false; - } - - return true; - } catch (NumberFormatException nfe) { - return false; - } - } - - private void startChatActivity() { - Intent chatActivityIntent = new Intent(this, ChatsActivity.class); - startActivity(chatActivityIntent); - finish(); - } -} diff --git a/PieMessage-Android/app/src/main/java/com/ericchee/bboyairwreck/piemessage/PieMessageApplication.java b/PieMessage-Android/app/src/main/java/com/ericchee/bboyairwreck/piemessage/PieMessageApplication.java index fd0d84d..97aacf0 100644 --- a/PieMessage-Android/app/src/main/java/com/ericchee/bboyairwreck/piemessage/PieMessageApplication.java +++ b/PieMessage-Android/app/src/main/java/com/ericchee/bboyairwreck/piemessage/PieMessageApplication.java @@ -2,8 +2,6 @@ import android.app.Application; import android.content.Intent; -import android.content.SharedPreferences; -import android.preference.PreferenceManager; import android.util.Log; import java.util.TreeMap; @@ -41,14 +39,6 @@ public void onCreate() { chatsMap = new TreeMap<>(); dbHelper.getAllChats(); - SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this); - - if (sharedPreferences.contains(getString(R.string.pref_socket_address_key))) { - startReceieveMessagesService(); - } - } - - public void startReceieveMessagesService() { Intent receiveService = new Intent(this, ReceiveMessagesService.class); startService(receiveService); } diff --git a/PieMessage-Android/app/src/main/java/com/ericchee/bboyairwreck/piemessage/PiePreferenceActivity.java b/PieMessage-Android/app/src/main/java/com/ericchee/bboyairwreck/piemessage/PiePreferenceActivity.java deleted file mode 100644 index 611a340..0000000 --- a/PieMessage-Android/app/src/main/java/com/ericchee/bboyairwreck/piemessage/PiePreferenceActivity.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.ericchee.bboyairwreck.piemessage; - -import android.app.Activity; -import android.content.Intent; -import android.content.SharedPreferences; -import android.preference.EditTextPreference; -import android.preference.Preference; -import android.preference.PreferenceFragment; -import android.preference.PreferenceManager; -import android.support.v7.app.AppCompatActivity; -import android.os.Bundle; -import android.util.Log; - -public class PiePreferenceActivity extends android.preference.PreferenceActivity { - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - getFragmentManager().beginTransaction().replace(android.R.id.content, new PiePreferenceFragment()).commit(); - } - - public static class PiePreferenceFragment extends PreferenceFragment implements SharedPreferences.OnSharedPreferenceChangeListener { - private static final String TAG = PiePreferenceFragment.class.getSimpleName(); - - @Override - public void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - // Load user settings xml resource - addPreferencesFromResource(R.xml.user_settings); - updateSocketAddressSummary(findPreference(getString(R.string.pref_socket_address_key))); - } - - @Override - public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) { - Preference pref = findPreference(key); - - Log.i(TAG, "Preference change detected"); - if (pref instanceof EditTextPreference && key.equals(getString(R.string.pref_socket_address_key))) { - Log.i(TAG, "Setting IP address"); - - PieMessageApplication.getInstance().stopService(new Intent(getActivity(), ReceiveMessagesService.class)); - PieMessageApplication.getInstance().startReceieveMessagesService(); - - updateSocketAddressSummary(pref); - } - } - - private void updateSocketAddressSummary(Preference pref) { - EditTextPreference editTextPreference = (EditTextPreference) pref; - pref.setSummary(editTextPreference.getText()); - } - - @Override - public void onAttach(Activity activity) { - super.onAttach(activity); - PreferenceManager.getDefaultSharedPreferences(activity).registerOnSharedPreferenceChangeListener(this); - } - } - - -} diff --git a/PieMessage-Android/app/src/main/java/com/ericchee/bboyairwreck/piemessage/ReceiveMessagesService.java b/PieMessage-Android/app/src/main/java/com/ericchee/bboyairwreck/piemessage/ReceiveMessagesService.java index 50aa3d5..3049ade 100644 --- a/PieMessage-Android/app/src/main/java/com/ericchee/bboyairwreck/piemessage/ReceiveMessagesService.java +++ b/PieMessage-Android/app/src/main/java/com/ericchee/bboyairwreck/piemessage/ReceiveMessagesService.java @@ -8,13 +8,11 @@ import android.content.Context; import android.content.Intent; import android.content.ServiceConnection; -import android.content.SharedPreferences; import android.media.Ringtone; import android.media.RingtoneManager; import android.net.Uri; import android.os.Binder; import android.os.IBinder; -import android.preference.PreferenceManager; import android.support.v4.app.NotificationCompat; import android.support.v4.app.TaskStackBuilder; import android.util.Log; @@ -69,9 +67,7 @@ protected void onHandleIntent(Intent intent) { Log.i(TAG, "onHandleIntent"); try { - SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this); - String socketAddress = sharedPreferences.getString(getString(R.string.pref_socket_address_key), "127.0.0.1"); - socket = new Socket(socketAddress, 5000); + socket = new Socket(Constants.socketAddress, 5000); PrintWriter output = new PrintWriter(socket.getOutputStream(), true); BufferedReader input = new BufferedReader(new InputStreamReader(socket.getInputStream())); diff --git a/PieMessage-Android/app/src/main/java/com/ericchee/bboyairwreck/piemessage/SendMessageTask.java b/PieMessage-Android/app/src/main/java/com/ericchee/bboyairwreck/piemessage/SendMessageTask.java index 2169322..0219bb5 100644 --- a/PieMessage-Android/app/src/main/java/com/ericchee/bboyairwreck/piemessage/SendMessageTask.java +++ b/PieMessage-Android/app/src/main/java/com/ericchee/bboyairwreck/piemessage/SendMessageTask.java @@ -1,8 +1,6 @@ package com.ericchee.bboyairwreck.piemessage; -import android.content.SharedPreferences; import android.os.AsyncTask; -import android.preference.PreferenceManager; import android.util.Log; import org.json.JSONException; @@ -35,9 +33,7 @@ protected Object doInBackground(Object[] objects) { try { Log.i(TAG, "Entering Client"); - SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this.activity); - String socketAddress = sharedPreferences.getString(activity.getString(R.string.pref_socket_address_key), "127.0.0.1"); - socket = new Socket(socketAddress, 5000); + socket = new Socket(Constants.socketAddress, 5000); PrintWriter output = new PrintWriter(socket.getOutputStream(), true); BufferedReader input = new BufferedReader(new InputStreamReader(socket.getInputStream())); diff --git a/PieMessage-Android/app/src/main/res/layout/activity_main.xml b/PieMessage-Android/app/src/main/res/layout/activity_main.xml deleted file mode 100644 index c6a8640..0000000 --- a/PieMessage-Android/app/src/main/res/layout/activity_main.xml +++ /dev/null @@ -1,66 +0,0 @@ - - - - - - - - - - - -