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

Start reCaptchaActivity when reCaptcha is requested and fix Typo 

* Fix typo setSearchWorkerResultListner to setSearchWorkerResultListener
This commit is contained in:
Benoît Mauduit 2016-12-07 22:19:43 +01:00
parent a5ac528c02
commit 53796043c3
2 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/org/schabi/newpipe/search_fragment/SearchInfoItemFragment.java
View File

@ -18,6 +18,7 @@ import android.view.inputmethod.InputMethodManager;
import android.widget.ProgressBar; import android.widget.ProgressBar;
import android.widget.Toast; import android.widget.Toast;
import org.schabi.newpipe.ReCaptchaActivity;
import org.schabi.newpipe.extractor.NewPipe; import org.schabi.newpipe.extractor.NewPipe;
import org.schabi.newpipe.extractor.search.SearchResult; import org.schabi.newpipe.extractor.search.SearchResult;
import org.schabi.newpipe.info_list.InfoItemBuilder; import org.schabi.newpipe.info_list.InfoItemBuilder;
@ -149,7 +150,7 @@ public class SearchInfoItemFragment extends Fragment {
} }
SearchWorker sw = SearchWorker.getInstance(); SearchWorker sw = SearchWorker.getInstance();
sw.setSearchWorkerResultListner(new SearchWorker.SearchWorkerResultListner() { sw.setSearchWorkerResultListener(new SearchWorker.SearchWorkerResultListener() {
@Override @Override
public void onResult(SearchResult result) { public void onResult(SearchResult result) {
infoListAdapter.addStreamItemList(result.resultList); infoListAdapter.addStreamItemList(result.resultList);
@ -174,6 +175,15 @@ public class SearchInfoItemFragment extends Fragment {
isLoading = false; isLoading = false;
loadingIndicator.setVisibility(View.GONE); loadingIndicator.setVisibility(View.GONE);
} }
@Override
public void onReCaptchaChallenge() {
Toast.makeText(getActivity(), "ReCaptcha Challenge requested",
Toast.LENGTH_LONG).show();
// Starting ReCaptcha Challenge Activity
Intent i = new Intent(getActivity(), ReCaptchaActivity.class);
getActivity().startActivity(i);
}
}); });
} }

23
app/src/main/java/org/schabi/newpipe/search_fragment/SearchWorker.java
View File

@ -8,6 +8,7 @@ import android.util.Log;
import android.view.View; import android.view.View;
import org.schabi.newpipe.extractor.exceptions.ExtractionException; import org.schabi.newpipe.extractor.exceptions.ExtractionException;
import org.schabi.newpipe.extractor.exceptions.reCaptchaException;
import org.schabi.newpipe.extractor.search.SearchEngine; import org.schabi.newpipe.extractor.search.SearchEngine;
import org.schabi.newpipe.extractor.search.SearchResult; import org.schabi.newpipe.extractor.search.SearchResult;
import org.schabi.newpipe.report.ErrorActivity; import org.schabi.newpipe.report.ErrorActivity;
@ -40,10 +41,11 @@ import java.io.IOException;
public class SearchWorker { public class SearchWorker {
private static final String TAG = SearchWorker.class.toString(); private static final String TAG = SearchWorker.class.toString();
public interface SearchWorkerResultListner { public interface SearchWorkerResultListener {
void onResult(SearchResult result); void onResult(SearchResult result);
void onNothingFound(final int stringResource); void onNothingFound(final int stringResource);
void onError(String message); void onError(String message);
void onReCaptchaChallenge();
} }
private class ResultRunnable implements Runnable { private class ResultRunnable implements Runnable {
@ -56,7 +58,7 @@ public class SearchWorker {
@Override @Override
public void run() { public void run() {
if(this.requestId == SearchWorker.this.requestId) { if(this.requestId == SearchWorker.this.requestId) {
searchWorkerResultListner.onResult(result); searchWorkerResultListener.onResult(result);
} }
} }
} }
@ -121,11 +123,18 @@ public class SearchWorker {
} }
// hard errors: // hard errors:
} catch (reCaptchaException e) {
h.post(new Runnable() {
@Override
public void run() {
searchWorkerResultListener.onReCaptchaChallenge();
}
});
} catch(IOException e) { } catch(IOException e) {
h.post(new Runnable() { h.post(new Runnable() {
@Override @Override
public void run() { public void run() {
searchWorkerResultListner.onNothingFound(R.string.network_error); searchWorkerResultListener.onNothingFound(R.string.network_error);
} }
}); });
e.printStackTrace(); e.printStackTrace();
@ -133,7 +142,7 @@ public class SearchWorker {
h.post(new Runnable() { h.post(new Runnable() {
@Override @Override
public void run() { public void run() {
searchWorkerResultListner.onError(e.getMessage()); searchWorkerResultListener.onError(e.getMessage());
} }
}); });
} catch(ExtractionException e) { } catch(ExtractionException e) {
@ -155,7 +164,7 @@ public class SearchWorker {
} }
private static SearchWorker searchWorker = null; private static SearchWorker searchWorker = null;
private SearchWorkerResultListner searchWorkerResultListner = null; private SearchWorkerResultListener searchWorkerResultListener = null;
private SearchRunnable runnable = null; private SearchRunnable runnable = null;
private int requestId = 0; //prevents running requests that have already ben expired private int requestId = 0; //prevents running requests that have already ben expired
@ -163,8 +172,8 @@ public class SearchWorker {
return searchWorker == null ? (searchWorker = new SearchWorker()) : searchWorker; return searchWorker == null ? (searchWorker = new SearchWorker()) : searchWorker;
} }
public void setSearchWorkerResultListner(SearchWorkerResultListner listener) { public void setSearchWorkerResultListener(SearchWorkerResultListener listener) {
searchWorkerResultListner = listener; searchWorkerResultListener = listener;
} }
private SearchWorker() { private SearchWorker() {