arno/etesync-android
1
0
Fork 0
mirror of https://github.com/etesync/android synced 2025-02-08 21:52:47 +00:00
Code Issues Releases Wiki Activity

Replace all etesync links to open in the webview activity.

Browse Source
This commit is contained in:
Tal Hacohen 2017-03-05 19:38:10 +01:00
parent c041ddb690
commit 8c9ec3bcc7
5 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/com/etesync/syncadapter/NotificationHelper.java
View File

@ -13,6 +13,7 @@ import android.support.v7.app.NotificationCompat;
import com.etesync.syncadapter.journalmanager.Exceptions; import com.etesync.syncadapter.journalmanager.Exceptions;
import com.etesync.syncadapter.ui.AccountSettingsActivity; import com.etesync.syncadapter.ui.AccountSettingsActivity;
import com.etesync.syncadapter.ui.DebugInfoActivity; import com.etesync.syncadapter.ui.DebugInfoActivity;
import com.etesync.syncadapter.ui.WebViewActivity;
import java.util.logging.Level; import java.util.logging.Level;
@ -95,7 +96,7 @@ public class NotificationHelper {
if (e instanceof Exceptions.UnauthorizedException) { if (e instanceof Exceptions.UnauthorizedException) {
detailsIntent = new Intent(this, AccountSettingsActivity.class); detailsIntent = new Intent(this, AccountSettingsActivity.class);
} else if (e instanceof Exceptions.UserInactiveException) { } else if (e instanceof Exceptions.UserInactiveException) {
startActivity(new Intent(Intent.ACTION_VIEW, Constants.dashboard)); WebViewActivity.openUrl(this, Constants.dashboard);
return; return;
} else { } else {
detailsIntent = new Intent(this, DebugInfoActivity.class); detailsIntent = new Intent(this, DebugInfoActivity.class);

5
app/src/main/java/com/etesync/syncadapter/ui/AccountsActivity.java
View File

@ -93,10 +93,10 @@ public class AccountsActivity extends AppCompatActivity implements NavigationVie
startActivity(new Intent(Intent.ACTION_VIEW, Constants.webUri)); startActivity(new Intent(Intent.ACTION_VIEW, Constants.webUri));
break; break;
case R.id.nav_guide: case R.id.nav_guide:
startActivity(new Intent(Intent.ACTION_VIEW, Constants.helpUri)); WebViewActivity.openUrl(this, Constants.helpUri);
break; break;
case R.id.nav_faq: case R.id.nav_faq:
startActivity(new Intent(Intent.ACTION_VIEW, Constants.faqUri)); WebViewActivity.openUrl(this, Constants.faqUri);
break; break;
case R.id.nav_report_issue: case R.id.nav_report_issue:
startActivity(new Intent(Intent.ACTION_VIEW, Constants.reportIssueUri)); startActivity(new Intent(Intent.ACTION_VIEW, Constants.reportIssueUri));
@ -110,5 +110,4 @@ public class AccountsActivity extends AppCompatActivity implements NavigationVie
drawer.closeDrawer(GravityCompat.START); drawer.closeDrawer(GravityCompat.START);
return true; return true;
} }
} }

9
app/src/main/java/com/etesync/syncadapter/ui/StartupDialogFragment.java
View File

@ -22,15 +22,16 @@ import android.support.annotation.NonNull;
import android.support.v4.app.DialogFragment; import android.support.v4.app.DialogFragment;
import android.support.v7.app.AlertDialog; import android.support.v7.app.AlertDialog;
import java.util.Collections;
import java.util.LinkedList;
import java.util.List;
import com.etesync.syncadapter.BuildConfig; import com.etesync.syncadapter.BuildConfig;
import com.etesync.syncadapter.Constants; import com.etesync.syncadapter.Constants;
import com.etesync.syncadapter.R; import com.etesync.syncadapter.R;
import com.etesync.syncadapter.model.ServiceDB; import com.etesync.syncadapter.model.ServiceDB;
import com.etesync.syncadapter.model.Settings; import com.etesync.syncadapter.model.Settings;
import java.util.Collections;
import java.util.LinkedList;
import java.util.List;
import lombok.Cleanup; import lombok.Cleanup;
public class StartupDialogFragment extends DialogFragment { public class StartupDialogFragment extends DialogFragment {

3
app/src/main/java/com/etesync/syncadapter/ui/setup/LoginActivity.java
View File

@ -17,6 +17,7 @@ import android.view.MenuItem;
import com.etesync.syncadapter.App; import com.etesync.syncadapter.App;
import com.etesync.syncadapter.Constants; import com.etesync.syncadapter.Constants;
import com.etesync.syncadapter.R; import com.etesync.syncadapter.R;
import com.etesync.syncadapter.ui.WebViewActivity;
/** /**
* Activity to initially connect to a server and create an account. * Activity to initially connect to a server and create an account.
@ -71,6 +72,6 @@ public class LoginActivity extends AppCompatActivity {
} }
public void showHelp(MenuItem item) { public void showHelp(MenuItem item) {
startActivity(new Intent(Intent.ACTION_VIEW, Constants.helpUri)); WebViewActivity.openUrl(this, Constants.helpUri);
} }
} }

4
app/src/main/java/com/etesync/syncadapter/ui/setup/LoginCredentialsFragment.java
View File

@ -21,6 +21,7 @@ import android.widget.EditText;
import com.etesync.syncadapter.Constants; import com.etesync.syncadapter.Constants;
import com.etesync.syncadapter.R; import com.etesync.syncadapter.R;
import com.etesync.syncadapter.ui.WebViewActivity;
import com.etesync.syncadapter.ui.widget.EditPassword; import com.etesync.syncadapter.ui.widget.EditPassword;
public class LoginCredentialsFragment extends Fragment { public class LoginCredentialsFragment extends Fragment {
@ -53,8 +54,7 @@ public class LoginCredentialsFragment extends Fragment {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
Uri createUri = Constants.registrationUrl.buildUpon().appendQueryParameter("email", editUserName.getText().toString()).build(); Uri createUri = Constants.registrationUrl.buildUpon().appendQueryParameter("email", editUserName.getText().toString()).build();
Intent intent = new Intent(Intent.ACTION_VIEW, createUri); WebViewActivity.openUrl(getContext(), createUri);
startActivity(intent);
} }
}); });