Peertube
/
NewPipe-app-android
mirror of https://github.com/TeamNewPipe/NewPipe/
1
0
Fork 0
Code Issues Releases Wiki Activity

Set result code and finish() Activity instead of starting MainActivity 

* Activities will start reCaptchaActivity with startActivityForResult and
look for RECAPTCHA_REQUEST and RESULT_OK | RESULT_CANCELED in : 'onActivityResult()'
This commit is contained in:
Benoît Mauduit 2017-01-02 17:30:35 +01:00
parent 0f69e6c64d
commit c87da9903f
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
app/src/main/java/org/schabi/newpipe/ReCaptchaActivity.java
View File

@ -2,6 +2,7 @@ package org.schabi.newpipe;
import android.app.Activity; import android.app.Activity;
import android.content.Intent; import android.content.Intent;
import android.graphics.Bitmap;
import android.os.Build; import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.support.v4.app.NavUtils; import android.support.v4.app.NavUtils;
@ -34,6 +35,8 @@ import android.webkit.WebViewClient;
* along with NewPipe. If not, see <http://www.gnu.org/licenses/>. * along with NewPipe. If not, see <http://www.gnu.org/licenses/>.
*/ */
public class ReCaptchaActivity extends AppCompatActivity { public class ReCaptchaActivity extends AppCompatActivity {
public static final int RECAPTCHA_REQUEST = 10;
public static final String TAG = ReCaptchaActivity.class.toString(); public static final String TAG = ReCaptchaActivity.class.toString();
public static final String YT_URL = "https://www.youtube.com"; public static final String YT_URL = "https://www.youtube.com";
@ -42,6 +45,9 @@ public class ReCaptchaActivity extends AppCompatActivity {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setContentView(R.layout.activity_recaptcha); setContentView(R.layout.activity_recaptcha);
// Set return to Cancel by default
setResult(RESULT_CANCELED);
ActionBar actionBar = getSupportActionBar(); ActionBar actionBar = getSupportActionBar();
actionBar.setDisplayHomeAsUpEnabled(true); actionBar.setDisplayHomeAsUpEnabled(true);
actionBar.setTitle(R.string.reCaptcha_title); actionBar.setTitle(R.string.reCaptcha_title);
@ -80,19 +86,26 @@ public class ReCaptchaActivity extends AppCompatActivity {
context = ctx; context = ctx;
} }
@Override
public void onPageStarted(WebView view, String url, Bitmap favicon) {
// TODO: Start Loader
super.onPageStarted(view, url, favicon);
}
@Override @Override
public void onPageFinished(WebView view, String url) { public void onPageFinished(WebView view, String url) {
String cookies = CookieManager.getInstance().getCookie(url); String cookies = CookieManager.getInstance().getCookie(url);
// TODO: Stop Loader
// find cookies : s_gl & goojf and Add cookies to Downloader // find cookies : s_gl & goojf and Add cookies to Downloader
if (find_access_cookies(cookies)) { if (find_access_cookies(cookies)) {
// Give cookies to Downloader class // Give cookies to Downloader class
Downloader.setCookies(mCookies); Downloader.setCookies(mCookies);
// Closing activity and return to parent. // Closing activity and return to parent
Intent intent = new Intent(context, org.schabi.newpipe.MainActivity.class); setResult(RESULT_OK);
intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP); finish();
NavUtils.navigateUpTo(context, intent);
} }
} }