Fixed Issue #2 Refine back stack

Refactored refine into a new activity
Sub-classed Refine and Explore under a common class with two ancestors (may consider removing RwServiceWebActivity ancestory for explore)
Removed singleInstance property from Activities, it causes issues and does not appear to benefit us any

 Fixed a non-reported issue where refine would not modify stream
 Added cull method to remove non-web applicable tags from taglist

Author: multidynamic

app-starter/src/main/AndroidManifest.xml

@@ -5,7 +5,6 @@
         android:allowBackup="true">
         <activity android:name=".MainActivity"
             android:label="@string/app_name"
-            android:launchMode="singleInstance"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:screenOrientation="portrait">
             <intent-filter>

rwapp/src/main/AndroidManifest.xml

@@ -29,7 +29,6 @@
         <activity
             android:name=".RwListenActivity"
             android:label="@string/title_activity_listen"
-            android:launchMode="singleInstance"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:screenOrientation="portrait"
             android:theme="@style/AppTheme" >
@@ -38,7 +37,6 @@
         <activity
             android:name=".RwSpeakActivity"
             android:label="@string/title_activity_speak"
-            android:launchMode="singleInstance"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:screenOrientation="portrait"
             android:theme="@style/AppTheme" >
@@ -52,12 +50,20 @@
         <activity
             android:name=".RwExploreActivity"
             android:label= "@string/title_activity_explore"
-            android:launchMode="singleInstance"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:screenOrientation="portrait"
             android:theme="@style/AppTheme" >
         </activity>
 
+        <activity
+            android:name=".RwRefineActivity"
+            android:label= "@string/title_activity_refine"
+            android:configChanges="keyboardHidden|orientation|screenSize"
+            android:screenOrientation="portrait"
+            android:theme="@style/AppTheme" >
+        </activity>
+
+
         <service android:label="RoundwareService" android:name="org.roundware.service.RWService">
             <meta-data android:name="com.google.android.gms.version" android:value="3265130" />
         </service>

rwapp/src/main/java/org/roundware/rwapp/RwApplication.java

@@ -29,6 +29,7 @@ public void onCreate() {
         ClassRegistry.register("RwSpeakActivity", RwSpeakActivity.class);
         ClassRegistry.register("RwListenActivity", RwListenActivity.class);
         ClassRegistry.register("RwExploreActivity", RwExploreActivity.class);
+        ClassRegistry.register("RwRefineActivity", RwRefineActivity.class);
     }
 
     // Src: http://stackoverflow.com/questions/2002288/static-way-to-get-context-on-android

rwapp/src/main/java/org/roundware/rwapp/RwExploreActivity.java

@@ -4,68 +4,16 @@
  */
 package org.roundware.rwapp;
 
-import android.app.Activity;
-import android.net.Uri;
-import android.os.Bundle;
-import android.util.Log;
-import android.view.Window;
-import android.webkit.WebSettings;
-import android.webkit.WebView;
-import android.webkit.WebViewClient;
-
 /**
- *
+ * Explore activity
  */
-public class RwExploreActivity extends Activity {
+public class RwExploreActivity extends RwServiceWebActivity {
     public static final String LOGTAG = RwExploreActivity.class.getSimpleName();
     private final static boolean D = true;
 
     @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        if (D) { Log.d(LOGTAG, "+++ onCreate +++"); }
-        super.onCreate(savedInstanceState);
-
-        getWindow().requestFeature(Window.FEATURE_PROGRESS);
-        setContentView(R.layout.activity_explore);
-        WebView webView = (WebView) findViewById(R.id.exploreWebView);
-
-        webView.loadUrl(getString(R.string.explore_url));
-
-        WebSettings webSettings = webView.getSettings();
-
-        webSettings.setAppCachePath(this.getFilesDir().getAbsolutePath());
-        webSettings.setAppCacheEnabled(true);
-        webSettings.setCacheMode(WebSettings.LOAD_DEFAULT);
-
-        webSettings.setJavaScriptEnabled(true);
-        webSettings.setJavaScriptCanOpenWindowsAutomatically(false);
-        webSettings.setSupportMultipleWindows(false);
-        webSettings.setSupportZoom(false);
-        webSettings.setSavePassword(false);
-        webSettings.setGeolocationDatabasePath(this.getFilesDir().getAbsolutePath());
-        webSettings.setGeolocationEnabled(false);
-        webSettings.setDatabaseEnabled(false);
-        webSettings.setDomStorageEnabled(false);
-
-        webView.setWebViewClient(new WebViewClient() {
-            @Override
-            public boolean shouldOverrideUrlLoading(WebView view, String url) {
-                Log.d(LOGTAG, "shouldOverrideUrlLoading");
-                Uri uri = Uri.parse(url);
-                if (uri.getScheme().equals("roundware")) {
-                    Log.d(LOGTAG, "Processing roundware uri: " + url);
-                    String schemeSpecificPart = uri.getSchemeSpecificPart(); // everything from : to #
-                    if ("//webview_done".equalsIgnoreCase((schemeSpecificPart))) {
-                        finish();
-                    }
-                    return true;
-                }
-                // open link in external browser
-                return super.shouldOverrideUrlLoading(view, url);
-            }
-
-        });
+    protected String getUrl() {
+        return getString(R.string.explore_url);
     }
-
 }