Merge pull request #22 from daktak/development

Display connection status in menu

Author: daktak

app/build.gradle

@@ -7,8 +7,8 @@ android {
         applicationId 'org.androidpn.client'
         minSdkVersion 11
         targetSdkVersion 23
-        versionCode 20160414
-        versionName "0.5.9"
+        versionCode 20160415
+        versionName "0.5.10"
     }
     buildTypes {
         release {
@@ -49,7 +49,7 @@ dependencies {
 
 android {
     lintOptions {
-    	disable 'InnerclassSeparator','GoogleAppIndexingWarning','InvalidPackage','IconDensities','MissingTranslation','TrustAllX509TrustManager'
+    	disable 'InnerclassSeparator','GoogleAppIndexingWarning','InvalidPackage','IconDensities','MissingTranslation','TrustAllX509TrustManager','UnusedResources'
 	checkReleaseBuilds false
     }
 }

app/src/main/java/org/androidpn/client/MainActivity.java

@@ -1,5 +1,6 @@
 package org.androidpn.client;
 
+import org.androidpn.client.SerivceManager.Constants;
 import org.androidpn.client.SerivceManager.LogUtil;
 import org.androidpn.client.SerivceManager.ServiceManager;
 import org.androidpn.client.helper.EasyPermissions;
@@ -171,9 +172,26 @@ public void onDismiss(ListView listView, int[] reverseSortedPositions) {
     public boolean onCreateOptionsMenu(Menu menu) {
         // Inflate the menu; this adds items to the action bar if it is present.
         getMenuInflater().inflate(R.menu.menu_main, menu);
+
         return true;
     }
 
+    @Override
+    public boolean onPrepareOptionsMenu(Menu menu) {
+        String status = getString(R.string.disconnected);
+        MenuItem item = menu.findItem(R.id.connection_status);
+        if (serviceManager != null) {
+            if(serviceManager.isLoggedIn()){
+                status = getString(R.string.connected);
+                //item.setEnabled(false);
+            }
+        }
+
+        item.setTitle(status);
+
+        return super.onPrepareOptionsMenu(menu);
+    }
+
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         // Handle action bar item clicks here. The action bar will
@@ -195,6 +213,20 @@ public boolean onOptionsItemSelected(MenuItem item) {
             datasource.close();
             resetList();
         }
+        if (id == R.id.connection_status) {
+            Log.d(LOGTAG, "Restarting sm");
+            if (serviceManager != null) {
+
+                serviceManager.stopService();
+                serviceManager.setSettings();
+                serviceManager.startService();
+
+            } else {
+                serviceManager = new ServiceManager(this);
+                serviceManager.setNotificationIcon(R.drawable.notification);
+                serviceManager.startService();
+            }
+        }
 
         return super.onOptionsItemSelected(item);
     }

app/src/main/java/org/androidpn/client/SerivceManager/Constants.java

@@ -46,6 +46,8 @@ public class Constants {
 
     public static final String XMPP_REGISTERED = "XMPP_REGISTERED";
 
+    public static final String XMPP_LOGGEDIN = "XMPP_LOGGEDIN";
+
     public static final String XMPP_EMAIL = "XMPP_EMAIL";
 
     // public static final String USER_KEY = "USER_KEY";

app/src/main/java/org/androidpn/client/SerivceManager/ServiceManager.java

@@ -97,6 +97,15 @@ public ServiceManager(Context context) {
         setSettings();
     }
 
+    public boolean isLoggedIn() {
+        boolean out = false;
+        sharedPrefs = context.getSharedPreferences(
+                Constants.SHARED_PREFERENCE_NAME, Context.MODE_PRIVATE);
+        if (sharedPrefs.contains(Constants.XMPP_LOGGEDIN)) {
+            out = true;
+        }
+        return out;
+    }
     public void setSettings() {
 
         //        apiKey = getMetaDataValue("ANDROIDPN_API_KEY");

app/src/main/java/org/androidpn/client/SerivceManager/XmppManager.java

@@ -129,6 +129,12 @@ public void connect() {
 
     public void disconnect() {
         Log.d(LOGTAG, "disconnect()...");
+        if (sharedPrefs.contains(Constants.XMPP_LOGGEDIN)) {
+            Editor editor = sharedPrefs.edit();
+            editor.remove(Constants.XMPP_LOGGEDIN);
+            editor.remove(Constants.XMPP_REGISTERED);
+            editor.apply();
+        }
         terminatePersistentConnection();
     }
 
@@ -285,6 +291,7 @@ private void addTask(Runnable runnable) {
     private void removeAccount() {
         Editor editor = sharedPrefs.edit();
         editor.remove(Constants.XMPP_REGISTERED);
+        editor.remove(Constants.XMPP_LOGGEDIN);
         editor.apply();
     }
 
@@ -391,7 +398,7 @@ public void processPacket(Packet packet) {
                                 Log.d(LOGTAG, "password=" + newPassword);
 
                                 Editor editor = sharedPrefs.edit();
-                                editor.putBoolean(Constants.XMPP_REGISTERED, true);
+                                editor.putString(Constants.XMPP_REGISTERED, "true");
                                 editor.remove(Constants.XMPP_USERNAME);
                                 editor.remove(Constants.XMPP_PASSWORD);
                                 editor.putString(Constants.XMPP_USERNAME,
@@ -457,6 +464,9 @@ public void run() {
                     xmppManager.getConnection().login(
                             xmppManager.getUsername(),
                             xmppManager.getPassword(), XMPP_RESOURCE_NAME);
+                    Editor editor = sharedPrefs.edit();
+                    editor.putString(Constants.XMPP_LOGGEDIN, "true");
+                    editor.apply();
                     Log.d(LOGTAG, "Loggedn in successfully");
 
                     // connection listener
@@ -497,6 +507,11 @@ public void run() {
                 }
 
             } else {
+                if (!(sharedPrefs.contains(Constants.XMPP_LOGGEDIN))) {
+                    Editor editor = sharedPrefs.edit();
+                    editor.putString(Constants.XMPP_LOGGEDIN, "true");
+                    editor.apply();
+                }
                 Log.i(LOGTAG, "Logged in already");
                 xmppManager.runTask();
             }

app/src/main/res/menu/menu_main.xml

@@ -12,4 +12,9 @@
         android:orderInCategory="99"
         android:title="@string/action_clear"
         app:showAsAction="never" />
+    <item
+        android:id="@+id/connection_status"
+        android:orderInCategory="98"
+        android:title=""
+        app:showAsAction="never" />
 </menu>

app/src/main/res/values/strings.xml

@@ -37,5 +37,7 @@
     <string name="email_pref">Optional email address</string>
     <string name="login_set">Login Settings</string>
     <string name="name">Name</string>
-    <string name="name_pref">Display name</string>
+    <string name="name_pref">Optional display name</string>
+    <string name="connected">Connected</string>
+    <string name="disconnected">Disconnected</string>
 </resources>

app/src/main/res/xml/settings.xml

@@ -25,7 +25,7 @@
             android:title="@string/auto" />
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/login_set" >
-  <!--  <EditTextPreference
+    <!-- <EditTextPreference
         android:title="@string/user"
         android:summary="@string/user_pref"
         android:defaultValue=""