Fixes #354 MOAT Solution Textfield is only enabled when there's a sol…

…ution. Also do not automatically open up the keyboard when there's nothing to type.
guardianproject · Jun 16, 2020 · d521ae0 · d521ae0
1 parent da5f80d
commit d521ae0
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -73,11 +73,6 @@
             android:stateNotNeeded="true"
             android:theme="@android:style/Theme.Translucent" />
 
-        <activity
-            android:name=".ui.VPNEnableActivity"
-            android:exported="false"
-            android:label="@string/app_name" />
-
         <activity
             android:name=".settings.SettingsPreferences"
             android:label="@string/app_name" />
@@ -107,7 +102,9 @@
 
         <activity android:name=".ui.onboarding.OnboardingActivity" />
         <activity android:name=".ui.onboarding.BridgeWizardActivity" />
-        <activity android:name=".ui.onboarding.MoatActivity" />
+        <activity
+            android:name=".ui.onboarding.MoatActivity"
+            android:windowSoftInputMode="stateHidden" />
         <activity android:name=".ui.onboarding.CustomBridgesActivity" />
 
         <provider
@@ -164,12 +161,12 @@
             android:name=".service.OrbotService"
             android:enabled="true"
             android:permission="android.permission.BIND_VPN_SERVICE"
-            android:stopWithTask="false" >
+            android:stopWithTask="false">
             <intent-filter>
                 <action android:name="android.net.VpnService" />
             </intent-filter>
         </service>
-        
+
     </application>
 
 </manifest>
diff --git a/app/src/main/java/org/torproject/android/ui/onboarding/MoatActivity.java b/app/src/main/java/org/torproject/android/ui/onboarding/MoatActivity.java
@@ -135,6 +135,7 @@ protected void onCreate(Bundle savedInstanceState) {
                 mProgressBar.setVisibility(View.GONE);
                 mIvCaptcha.setImageBitmap(BitmapFactory.decodeByteArray(mCaptcha, 0, mCaptcha.length));
                 mRequestInProgress = false;
+                mEtSolution.setEnabled(true);
             }
         }
         else {

diff --git a/app/src/main/res/layout/activity_moat.xml b/app/src/main/res/layout/activity_moat.xml
@@ -65,6 +65,7 @@
                 android:layout_height="wrap_content"
                 android:autofillHints=""
                 android:ems="10"
+                android:enabled="false"
                 android:hint="@string/enter_characters_from_image"
                 android:imeOptions="actionSend"
                 android:inputType="textShortMessage|text"