Skip to content

Testing ssl connections #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cesine merged 5 commits into from
Jan 1, 2018
Merged

Testing ssl connections #12

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
241a934
debugged file uploads
cesine Dec 23, 2017
6a1c6e9
requesting network permissions when audio files are added to datum
cesine Dec 27, 2017
bee3da2
overriding upload url
cesine Dec 27, 2017
1efdd24
renamed fielddb class and appending line feed to file
cesine Dec 29, 2017
83ce37c
requesting permissions to write to file to save the sample images
cesine Dec 29, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
overriding upload url 
upload works
  • Loading branch information
@cesine
cesine committed Dec 27, 2017
commit bee3da228cce500a15480277ada6c0b91f01bf96
4 changes: 3 additions & 1 deletion ...src/main/java/com/github/fielddb/lessons/ui/DatumSpeechRecognitionHypothesesFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
import android.widget.TableLayout;
import android.widget.Toast;

import com.github.fielddb.lessons.PrivateConstants;
import com.github.fielddb.database.DatumContentProvider.DatumTable;
import com.github.fielddb.Config;
import com.github.fielddb.datacollection.SecureHttpClient;
Expand Down Expand Up @@ -763,7 +764,8 @@ public void onDestroy() {
return;
}
Config.D = false;
Log.d(Config.TAG, "Requesting upload of recognition audio file " + filename);
// Config.DEFAULT_UPLOAD_AUDIO_VIDEO_URL = PrivateConstants.DEFAULT_UPLOAD_AUDIO_VIDEO_URL;
Log.d(Config.TAG, "Requesting upload of recognition audio file " + filename + " to " + Config.DEFAULT_UPLOAD_AUDIO_VIDEO_URL);
Intent uploadAudioFile = new Intent(getActivity(), UploadAudioVideoService.class);
uploadAudioFile.setData(Uri.parse(filename));
uploadAudioFile.putExtra(Config.EXTRA_PARTICIPANT_ID, Config.CURRENT_USERNAME);
Expand Down