diff --git a/app/src/main/java/fr/free/nrw/commons/CommonsApplication.java b/app/src/main/java/fr/free/nrw/commons/CommonsApplication.java index 8d6332c6a..b7b75fae5 100644 --- a/app/src/main/java/fr/free/nrw/commons/CommonsApplication.java +++ b/app/src/main/java/fr/free/nrw/commons/CommonsApplication.java @@ -142,10 +142,6 @@ public class CommonsApplication extends Application { System.setProperty("in.yuvi.http.fluent.PROGRESS_TRIGGER_THRESHOLD", "3.0"); Fresco.initialize(this); - SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences( - CommonsApplication.getInstance()); - // Increase counter by one, starts from 1 - prefs.edit().putInt("app_start_counter", prefs.getInt("app_start_counter" ,0) + 1).commit(); //For caching area -> categories cacheData = new CacheController(); diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsActivity.java b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsActivity.java index 07e0fc5e7..fa1d2d96f 100644 --- a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsActivity.java +++ b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsActivity.java @@ -3,13 +3,11 @@ package fr.free.nrw.commons.contributions; import android.content.ComponentName; import android.content.ContentResolver; import android.content.Context; -import android.content.DialogInterface; import android.content.Intent; import android.content.ServiceConnection; import android.content.SharedPreferences; import android.database.Cursor; import android.database.DataSetObserver; -import android.net.Uri; import android.os.Bundle; import android.os.IBinder; import android.preference.PreferenceManager; @@ -18,17 +16,13 @@ import android.support.v4.app.LoaderManager; import android.support.v4.content.CursorLoader; import android.support.v4.content.Loader; import android.support.v4.widget.CursorAdapter; -import android.support.v7.app.AlertDialog; import android.view.Menu; import android.view.MenuItem; import android.view.View; import android.widget.Adapter; import android.widget.AdapterView; -import java.text.ParseException; -import java.text.SimpleDateFormat; import java.util.ArrayList; -import java.util.Date; import butterknife.ButterKnife; import fr.free.nrw.commons.CommonsApplication; @@ -111,19 +105,6 @@ public class ContributionsActivity } } - @Override - protected void onPause() { - super.onPause(); - } - - - - @Override - protected void onStart() { - super.onStart(); - displayFeedbackPopup(); - } - @Override protected void onAuthCookieAcquired(String authCookie) { // Do a sync everytime we get here! @@ -355,55 +336,4 @@ public class ContributionsActivity context.startActivity(contributionsIntent); } - private void displayFeedbackPopup() { - - Date popupMessageEndDate = null; - try { - String validUntil = "23/08/2017"; - SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy"); - popupMessageEndDate = sdf.parse(validUntil); - } catch (ParseException e) { - e.printStackTrace(); - } - - final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences( - CommonsApplication.getInstance()); - - // boolean to save users request about displaying popup - boolean displayFeedbackPopup = prefs.getBoolean("display_feedbak_popup", true); - - // boolean to recognize is application re-started. Will be used for "remind me later" option - int appStartCounter = prefs.getInt("app_start_counter" ,0); - - // if time is valid and shared pref says display - if (new Date().before(popupMessageEndDate) && displayFeedbackPopup && (appStartCounter == 4)) { - - new AlertDialog.Builder(this) - .setTitle(getResources().getString(R.string.feedback_popup_title)) - .setMessage(getResources().getString(R.string.feedback_popup_description)) - .setPositiveButton(getResources().getString(R.string.feedback_popup_accept), - new DialogInterface.OnClickListener() { - public void onClick(DialogInterface dialog, int which) { - // Go to the page - Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri - .parse(getResources() - .getString(R.string.feedback_page_url))); - startActivity(browserIntent); - // No need to dislay this window to the user again. - prefs.edit().putBoolean("display_feedbak_popup" , false).commit(); - dialog.dismiss(); - } - }) - .setNegativeButton(getResources().getString(R.string.feedback_popup_decline), - new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - // Dismiss the dialog and not to show it later - prefs.edit().putBoolean("display_feedbak_popup", false).commit(); - dialog.dismiss(); - } - }) - .create().show(); - } - } } diff --git a/app/src/main/java/fr/free/nrw/commons/theme/NavigationBaseActivity.java b/app/src/main/java/fr/free/nrw/commons/theme/NavigationBaseActivity.java index 6710b6367..d86090c91 100644 --- a/app/src/main/java/fr/free/nrw/commons/theme/NavigationBaseActivity.java +++ b/app/src/main/java/fr/free/nrw/commons/theme/NavigationBaseActivity.java @@ -1,9 +1,7 @@ package fr.free.nrw.commons.theme; import android.content.ActivityNotFoundException; -import android.content.DialogInterface; import android.content.Intent; -import android.net.Uri; import android.support.annotation.NonNull; import android.support.design.widget.NavigationView; import android.support.v4.widget.DrawerLayout; @@ -11,7 +9,6 @@ import android.support.v7.app.ActionBarDrawerToggle; import android.support.v7.app.AlertDialog; import android.support.v7.widget.Toolbar; import android.view.MenuItem; -import android.view.View; import android.view.ViewGroup; import android.widget.Toast; @@ -118,14 +115,6 @@ public class NavigationBaseActivity extends BaseActivity Toast.makeText(this, R.string.no_email_client, Toast.LENGTH_SHORT).show(); } return true; - case R.id.action_developer_plans: - drawerLayout.closeDrawer(navigationView); - // Go to the page - Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri - .parse(getResources() - .getString(R.string.feedback_page_url))); - startActivity(browserIntent); - return true; case R.id.action_logout: new AlertDialog.Builder(this) .setMessage(R.string.logout_verification) diff --git a/app/src/main/res/drawable/ic_help_outline_black_24dp.xml b/app/src/main/res/drawable/ic_help_outline_black_24dp.xml deleted file mode 100644 index e7cf8ea21..000000000 --- a/app/src/main/res/drawable/ic_help_outline_black_24dp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/menu/drawer.xml b/app/src/main/res/menu/drawer.xml index cb6b63ffc..f0a0a5e29 100644 --- a/app/src/main/res/menu/drawer.xml +++ b/app/src/main/res/menu/drawer.xml @@ -30,11 +30,6 @@ android:icon="@drawable/ic_feedback_black_24dp" android:title="@string/navigation_item_feedback"/> - - Error while caching pictures A unique descriptive title for the file, which will serve as a filename. You may use plain language with spaces. Do not include the file extension Please describe the media as much as possible: Where was it taken? What does it show? What is the context? Please describe the objects or persons. Reveal information that can not be easily guessed, for instance the time of day if it is a landscape. If the media shows something unusual, please explain what makes it unusual. - Feedback wanted - We are planning several new features and improvements for the app! Would you like to review them and provide feedback? \n\n(You can always access this by selecting "Developer plans" in the navigation drawer) - No thanks - Sure, take me there! - https://meta.wikimedia.org/wiki/Grants:Project/Improve_\'Upload_to_Commons\'_Android_App/Renewal/User_feedback - Developer plans +