Merge branch 'Samagra-Development:develop' into develop

Samagra-Development · May 19, 2023 · 22e1fdd · 22e1fdd
2 parents cd5d4e7 + 9e75468
commit 22e1fdd
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/odk/collect/collect_app/src/main/AndroidManifest.xml b/odk/collect/collect_app/src/main/AndroidManifest.xml
@@ -101,12 +101,6 @@ the specific language governing permissions and limitations under the License.
             android:name=".activities.MainMenuActivity"
             android:exported="true"
             android:theme="@style/Theme.Collect.SplashScreen">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
         </activity>
 
         <activity android:name="org.odk.collect.android.activities.CrashHandlerActivity" />

diff --git a/sample/src/main/java/io/samagra/oce_sample/ODKFeatureTesterActivity.kt b/sample/src/main/java/io/samagra/oce_sample/ODKFeatureTesterActivity.kt
@@ -68,13 +68,19 @@ class ODKFeatureTesterActivity : AppCompatActivity(), View.OnClickListener {
         ODKProvider.init(application)
         odkInteractor = ODKProvider.getOdkInteractor()
         progressBar.visibility = View.VISIBLE
+        downloadFormsButton.isEnabled=false
+        downloadAllFormsButton.isEnabled=false
+        clearAllFormsButton.isEnabled=false
         odkInteractor.setupODK(IOUtils.toString(resources.openRawResource(R.raw.settings)), false, object :
             ODKProcessListener {
             override fun onProcessComplete() {
                 val currentProjectProvider = DaggerAppDependencyComponent.builder().application(application).build().currentProjectProvider()
                 currentProjectProvider.getCurrentProject().name
                 formsDatabaseInteractor = ODKProvider.getFormsDatabaseInteractor()
                 networkInteractor = ODKProvider.getFormsNetworkInteractor()
+                downloadFormsButton.isEnabled=true
+                downloadAllFormsButton.isEnabled=true
+                clearAllFormsButton.isEnabled=true
                 progressBar.visibility = View.INVISIBLE
             }
             override fun onProcessingError(exception: Exception) {