ROCC 494 push remote updates

.gitignore

@@ -7,3 +7,6 @@
 /captures
 *debug*
 *release*
+*.swp
+*.swo
+*~

app/build.gradle

@@ -25,11 +25,26 @@ android {
     }
     buildTypes {
         release {
+            versionNameSuffix ".release"
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            buildConfigField "String", "ROCC_URL_PREFIX", ROCC_URL_PREFIX
+            buildConfigField "String", "ROCC_WEBSOCKETS_PREFIX", ROCC_WEBSOCKETS_PREFIX
+            buildConfigField "Boolean", "ENABLE_IN_APP_ROCC_URL_SETTING", "false"
+            resValue "bool", "enable_in_app_rocc_url_setting", "false"
         }
         debug {
             versionNameSuffix ".debug"
+            buildConfigField "String", "ROCC_URL_PREFIX", ROCC_URL_PREFIX
+            buildConfigField "String", "ROCC_WEBSOCKETS_PREFIX", ROCC_WEBSOCKETS_PREFIX
+            buildConfigField "Boolean", "ENABLE_IN_APP_ROCC_URL_SETTING", "true"
+            resValue "bool", "enable_in_app_rocc_url_setting", "true"
+        }
+        clientDebug {
+            initWith debug
+            buildConfigField "Boolean", "ENABLE_IN_APP_ROCC_URL_SETTING", "false"
+            resValue "bool", "enable_in_app_rocc_url_setting", "false"
+
         }
     }
     defaultConfig {
@@ -80,12 +95,12 @@ dependencies {
     implementation 'com.github.codekidX:storage-chooser:2.0.3'
     implementation 'com.squareup.moshi:moshi:1.8.0'
     implementation 'com.opencsv:opencsv:4.3.2'
-    implementation 'org.jsoup:jsoup:1.11.3'
     implementation 'com.android.support:support-v4:28.0.0'
     implementation 'android.arch.lifecycle:extensions:1.1.1'
     implementation 'com.android.support.constraint:constraint-layout:1.1.3'
     implementation 'com.crashlytics.sdk.android:crashlytics:2.10.1'
     implementation 'com.google.firebase:firebase-core:16.0.9'
+    implementation 'org.java-websocket:Java-WebSocket:1.4.1'
     kapt 'com.squareup.moshi:moshi-kotlin-codegen:1.6.0'
     testImplementation 'junit:junit:4.12'
     testImplementation 'androidx.test:core:1.2.0'

app/src/main/AndroidManifest.xml

@@ -19,6 +19,7 @@
         android:theme="@style/AppTheme"
         android:largeHeap="true"
         android:fullBackupContent="false"
+        android:usesCleartextTraffic="true"
         tools:replace="android:icon,android:roundIcon"
         >
 
@@ -32,12 +33,6 @@
                 android:resource="@xml/file_paths"/>
         </provider>
 
-        <!-- Pager Base -->
-        <activity
-            android:name=".controller.pager.PagerBaseActivity"
-            android:label="Pager Base"
-            android:screenOrientation="portrait" />
-
         <!-- Splash Screen -->
         <activity
             android:name=".controller.SplashScreenActivity"
@@ -60,28 +55,14 @@
             android:name=".controller.RegistrationActivity"
             android:screenOrientation="portrait" />
         <activity
-            android:name=".controller.WorkspaceUpdateActivity"
+            android:name=".controller.phase.PhaseBaseActivity"
             android:screenOrientation="portrait" />
         <activity
-            android:name=".controller.WorkspaceDialogUpdateActivity"
-            android:screenOrientation="portrait" />
-        <!-- Learn -->
-        <activity
-            android:name=".controller.learn.LearnActivity"
+            android:name=".controller.WorkspaceUpdateActivity"
             android:screenOrientation="portrait" />
         <activity
-            android:name=".controller.remote.WholeStoryBackTranslationActivity"
+            android:name=".controller.WorkspaceDialogUpdateActivity"
             android:screenOrientation="portrait" />
-        <!-- Create -->
-        <activity
-            android:name=".controller.export.CreateActivity"
-            android:screenOrientation="portrait"
-            android:windowSoftInputMode="stateHidden" />
-        <!-- Share -->
-        <activity
-            android:name=".controller.export.ShareActivity"
-            android:screenOrientation="portrait"
-            android:windowSoftInputMode="stateHidden" />
     </application>
 
-</manifest>
+</manifest>

app/src/main/java/org/sil/storyproducer/controller/MainActivity.kt

@@ -1,13 +1,14 @@
 package org.sil.storyproducer.controller
 
+import android.app.Activity
 import android.app.AlertDialog
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import android.content.IntentFilter
 import android.net.ConnectivityManager
 import android.os.Bundle
-import android.os.SystemClock
+import android.preference.PreferenceManager
 import android.support.design.widget.NavigationView
 import android.support.v4.view.GravityCompat
 import android.support.v4.widget.DrawerLayout
@@ -19,21 +20,91 @@ import android.view.Menu
 import android.view.MenuItem
 import android.view.View
 import android.webkit.WebView
+import android.widget.EditText
+import android.widget.LinearLayout
 import android.widget.ProgressBar
 import kotlinx.coroutines.GlobalScope
-import kotlinx.coroutines.Job
 import kotlinx.coroutines.async
 import org.sil.storyproducer.R
-import org.sil.storyproducer.model.Phase
-import org.sil.storyproducer.model.PhaseType
-import org.sil.storyproducer.model.Story
 import org.sil.storyproducer.model.Workspace
 import org.sil.storyproducer.tools.Network.ConnectivityStatus
 import org.sil.storyproducer.tools.Network.VolleySingleton
 import java.io.Serializable
 
+fun handleDrawerItemSelection(activity: Activity, menuItem: MenuItem, drawerLayout: DrawerLayout, currentItemId: Int?): Boolean {
+    menuItem.isChecked = true
+    drawerLayout.closeDrawers()
+
+    if (currentItemId == menuItem.itemId) {
+        return true
+    }
+
+    when (menuItem.itemId) {
+        R.id.nav_workspace -> {
+            val intent = Intent(activity, WorkspaceUpdateActivity::class.java)
+            activity.startActivity(intent)
+            activity.finish()
+        }
+        R.id.nav_stories -> {
+            val intent = Intent(activity, MainActivity::class.java)
+            activity.startActivity(intent)
+            activity.finish()
+        }
+        R.id.nav_registration -> {
+            val intent = Intent(activity, RegistrationActivity::class.java)
+            activity.startActivity(intent)
+            activity.finish()
+        }
+        R.id.nav_license -> {
+            val dialog = AlertDialog.Builder(activity)
+                    .setTitle(activity.getString(R.string.license_title))
+                    .setMessage(activity.getString(R.string.license_body))
+                    .setPositiveButton(activity.getString(R.string.ok)) { _, _ -> }.create()
+            dialog.show()
+        }
+        R.id.nav_set_rocc_url_prefix -> {
+            val container = LinearLayout(activity)
+            container.orientation = LinearLayout.VERTICAL
+            container.layoutParams = LinearLayout.LayoutParams(
+                    LinearLayout.LayoutParams.MATCH_PARENT,
+                    LinearLayout.LayoutParams.MATCH_PARENT)
+            val roccPrefixInput = EditText(activity)
+            roccPrefixInput.setText(PreferenceManager.getDefaultSharedPreferences(activity).getString("ROCC_URL_PREFIX", "")
+                    ?: "")
+            container.addView(roccPrefixInput,
+                    LinearLayout.LayoutParams(
+                            LinearLayout.LayoutParams.MATCH_PARENT,
+                            LinearLayout.LayoutParams.WRAP_CONTENT))
+            val webSocketsInput = EditText(activity)
+            container.addView(webSocketsInput,
+                    LinearLayout.LayoutParams(
+                            LinearLayout.LayoutParams.MATCH_PARENT,
+                            LinearLayout.LayoutParams.WRAP_CONTENT))
+            webSocketsInput.setText(PreferenceManager.getDefaultSharedPreferences(activity).getString("WEBSOCKETS_URL", "")
+                    ?: "")
+            val dialog = AlertDialog.Builder(activity)
+                    .setTitle("ROCC URL Prefix")
+                    .setMessage("Enter a string to prefix all requests to the remote consultant site")
+                    .setView(container)
+                    .setPositiveButton(activity.getString(R.string.ok)) { _, _ ->
+                        PreferenceManager.getDefaultSharedPreferences(activity).edit()
+                                .putString("ROCC_URL_PREFIX", roccPrefixInput.text.toString())
+                                .putString("WEBSOCKETS_URL", webSocketsInput.text.toString()).apply()
+                    }.create()
+            dialog.show()
+        }
+        R.id.nav_clear_all_messages -> {
+        }
+        R.id.nav_forget_remote_story_id -> {
+            Workspace.activeStory.remoteId = null
+        }
+    }
+
+    return true
+}
+
 class MainActivity : AppCompatActivity(), Serializable {
-    private var mDrawerLayout: DrawerLayout? = null
+    private lateinit var mDrawerLayout: DrawerLayout
 
     private val receiver = object : BroadcastReceiver() {
         override fun onReceive(context: Context, intent: Intent) {
@@ -60,7 +131,7 @@ class MainActivity : AppCompatActivity(), Serializable {
         pb.visibility = View.VISIBLE
 
         GlobalScope.async {
-            if(!Workspace.isInitialized) Workspace.initializeWorskpace([email protected])
+            if (!Workspace.isInitialized) Workspace.initializeWorkspace([email protected])
             runOnUiThread {
                 pb.visibility = View.GONE
                 supportFragmentManager.beginTransaction().add(R.id.fragment_container, StoryListFrag()).commit()
@@ -74,31 +145,23 @@ class MainActivity : AppCompatActivity(), Serializable {
         return true
     }
 
-    /**
-     * move to the chosen story
-     */
-    fun switchToStory(story: Story) {
-        Workspace.activeStory = story
-        val intent = Intent(this.applicationContext, Workspace.activePhase.getTheClass())
-        startActivity(intent)
-    }
-
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         return when (item.itemId) {
             android.R.id.home -> {
-                mDrawerLayout!!.openDrawer(GravityCompat.START)
+                mDrawerLayout.openDrawer(GravityCompat.START)
                 true
             }
             R.id.helpButton -> {
                 val alert = AlertDialog.Builder(this)
                 alert.setTitle("Story List Help")
 
                 val wv = WebView(this)
-                val iStream = assets.open(Phase.getHelpName(PhaseType.STORY_LIST))
+                val iStream = assets.open("story_list.html")
                 val text = iStream.reader().use {
-                        it.readText() }
+                    it.readText()
+                }
 
-                wv.loadData(text,"text/html",null)
+                wv.loadData(text, "text/html", null)
                 alert.setView(wv)
                 alert.setNegativeButton("Close") { dialog, _ ->
                     dialog!!.dismiss()
@@ -116,52 +179,18 @@ class MainActivity : AppCompatActivity(), Serializable {
     private fun setupDrawer() {
         val toolbar = findViewById<Toolbar>(R.id.toolbar)
         setSupportActionBar(toolbar)
-        val actionbar: ActionBar? = supportActionBar
-        actionbar?.apply {
+        val actionbar: ActionBar = supportActionBar!!
+        actionbar.apply {
             setDisplayHomeAsUpEnabled(true)
             setHomeAsUpIndicator(R.drawable.ic_menu_white_24dp)
         }
 
-        supportActionBar!!.setDisplayHomeAsUpEnabled(true)
-        supportActionBar!!.setHomeButtonEnabled(true)
-
         mDrawerLayout = findViewById(R.id.drawer_layout)
-        //Lock from opening with left swipe
-        mDrawerLayout!!.setDrawerLockMode(DrawerLayout.LOCK_MODE_LOCKED_CLOSED)
+        mDrawerLayout.setDrawerLockMode(DrawerLayout.LOCK_MODE_LOCKED_CLOSED)
         val navigationView: NavigationView = findViewById(R.id.nav_view)
+        val drawerLayout = mDrawerLayout
         navigationView.setNavigationItemSelectedListener { menuItem ->
-            // set item as selected to persist highlight
-            menuItem.isChecked = true
-            // close drawer when item is tapped
-            mDrawerLayout!!.closeDrawers()
-
-            // Add code here to update the UI based on the item selected
-            // For example, swap UI fragments here
-            val intent: Intent
-            when (menuItem.itemId) {
-                R.id.nav_workspace -> {
-                    intent = Intent(this, WorkspaceUpdateActivity::class.java)
-                    this.startActivity(intent)
-                    this.finish()
-                }
-                R.id.nav_stories -> {
-                    // Current fragment
-                }
-                R.id.nav_registration -> {
-                    intent = Intent(this, RegistrationActivity::class.java)
-                    this.startActivity(intent)
-                    this.finish()
-                }
-                R.id.nav_license -> {
-                    val dialog = AlertDialog.Builder(this)
-                            .setTitle(this.getString(R.string.license_title))
-                            .setMessage(this.getString(R.string.license_body))
-                            .setPositiveButton(this.getString(R.string.ok)) { _, _ -> }.create()
-                    dialog.show()
-                }
-            }
-
-            true
+            handleDrawerItemSelection(this, menuItem, drawerLayout, R.id.nav_stories)
         }
     }